From patchwork Sun Oct 25 06:04:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1387124 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=g/mu6G7V; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CJnWx3m1Lz9sVW for ; Sun, 25 Oct 2020 17:05:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B35B6824A8; Sun, 25 Oct 2020 07:05:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="g/mu6G7V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CC2BA8248E; Sun, 25 Oct 2020 07:05:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4F2D18244B for ; Sun, 25 Oct 2020 07:04:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1603605895; bh=0JeEtO97p1y2v/pDA//1RhpZejj4RR3MhuATkfVXQWw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=g/mu6G7VWD4v2ffEAvh2tRZk8ZjRohvjIriaKPCgA9jne/t4QsGmT/wZqD2hFz6cJ RSLYVXysMrH1mYXifsEoArcPrb2RqFg1zXWjjQuHK2uiJ4ckbFJ+31GXkBuRXXrrFK iJJUc/TruVIlq9fx4MEgs/oyQkyRzXDPmrfsjy6I= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from LT02.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx004 [212.227.17.184]) with ESMTPSA (Nemesis) id 1M3UUy-1kX7NV0HJa-000cNm; Sun, 25 Oct 2020 07:04:55 +0100 From: Heinrich Schuchardt To: Simon Glass Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/5] sandbox: eth-raw: do not close the console input Date: Sun, 25 Oct 2020 07:04:37 +0100 Message-Id: <20201025060441.11961-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201025060441.11961-1-xypron.glpk@gmx.de> References: <20201025060441.11961-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:xoH4MAkeCh91M0U6Z5/Gc1ReSTjJHw77a6yQb01gllwl0YgLqJn Ag+x5E+I3sEEGKdj6WBgVCu4BeoX8+3nEPUMh5Z9WkdBML1W4B1S2RHsBxCXQdX4gWNEhFE Zx+F9vEHvdmV3MEHMprv4lsVrCg0XQeS53JB2+ch//TkNElI20q3UYcJJfMEWjpXo6Bj7Wb ob+FrlAMRwJDxh8eUBZuA== X-UI-Out-Filterresults: notjunk:1;V03:K0:tE7ifJKHvm8=:lgjdlIGI7wwcqtbrj2etiL Ed2HznGzb7A/Nlqpec2hFYo4HrAnJcEWg8qpyB3KYwlXuwYmfoINjNct2irXIT4RiLbv8CoYP unF3g4rgaX1S/BPLgm/w17e6GNKGoHndXYQgWx9LT4KDEhK4bbUOh/Q4u3OViRUzLkLE1vSoQ z7ZKJtQi6dSv50k+Nnen6YIlDLek6rbhPqM+jOry1BMSscDirpH/FWPMBWGJPr+vch6WWsdTS 2/zhaNJHnepBKssd3D79Dngm3g4YVCTlPMb2rLzGCH2llUYlMMGC6/4vMRsGE2LD2jBqXMRJ4 a5GGDNp9l3vhaOnlJYS9Z7I/LS1nCAZVwIa8pBL8I1G5mBOOfyw2HtHSDoigrG+3b6HrG3Rh+ +dBWo7cPRXpuFMrwaXRkS966b7UsS6XeSq5H3s4HPa8RuuK8HqYIvA06bXF1OOzChw2KGoaxw Eqp1MImCmbu/WEbt2w23Rx9sqeaUPkJ/VrRTcqb2l4MAOLts8CWo5xFEBYnNQbjGiWc+5eiXm WRIVvtYk1ikypqh1sfj2KnubDbzDgUPii9MeFrsx4b8HjUbhTHmzS5SQl2gwXvW6W17RuZR4N z0hx9Mek1Tlk0pmlOpUXMnaBKYUxyNeAgs3bPs7XX15yvFcdFG8mVRODnjlKJdWamS38KmqnE uUlAYxDkkeVd8t+cKVK515XZoZtXLZmHWBzzFn3zRhG09rok1D80BKiFY20A4hQlsjt5ECyhy MsdWG6rkwRE1TyUorjyzFSf04aKTf+inTiSlMhgogefaVWHPNq55dgu0hlHaS9S45VEmOmlVA 1j70tn7ZuR+FcJRkvaHkOUBdmA3ssCPIHrXbw12HLwGuLbvaoYClO40ulSjgr5B3dgn+7GgOd nE5/MRRsFbhuzOQP9nOw== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean When the sandbox eth-raw device host_lo is removed this leads to closing the console input. Do not call close(0). Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- arch/sandbox/cpu/eth-raw-os.c | 8 ++++---- arch/sandbox/cpu/os.c | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) -- 2.28.0 diff --git a/arch/sandbox/cpu/eth-raw-os.c b/arch/sandbox/cpu/eth-raw-os.c index da01d1addf..6a8d809756 100644 --- a/arch/sandbox/cpu/eth-raw-os.c +++ b/arch/sandbox/cpu/eth-raw-os.c @@ -53,7 +53,7 @@ int sandbox_eth_raw_os_is_local(const char *ifname) } ret = !!(ifr.ifr_flags & IFF_LOOPBACK); out: - close(fd); + os_close(fd); return ret; } @@ -220,7 +220,7 @@ int sandbox_eth_raw_os_send(void *packet, int length, struct sockaddr_in addr; if (priv->local_bind_sd != -1) - close(priv->local_bind_sd); + os_close(priv->local_bind_sd); /* A normal UDP socket is required to bind */ priv->local_bind_sd = socket(AF_INET, SOCK_DGRAM, 0); @@ -284,11 +284,11 @@ void sandbox_eth_raw_os_stop(struct eth_sandbox_raw_priv *priv) { free(priv->device); priv->device = NULL; - close(priv->sd); + os_close(priv->sd); priv->sd = -1; if (priv->local) { if (priv->local_bind_sd != -1) - close(priv->local_bind_sd); + os_close(priv->local_bind_sd); priv->local_bind_sd = -1; priv->local_bind_udp_port = 0; } diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index e7ec892bdf..c461fb0db0 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -86,7 +86,10 @@ int os_open(const char *pathname, int os_flags) int os_close(int fd) { - return close(fd); + /* Do not close the console input */ + if (fd) + return close(fd); + return -1; } int os_unlink(const char *pathname)