From patchwork Tue Oct 27 18:46:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1388882 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=X/r1O9qX; 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 4CLLL84Bpkz9sSs for ; Wed, 28 Oct 2020 05:47:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C082D82430; Tue, 27 Oct 2020 19:47:23 +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="X/r1O9qX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6359182483; Tue, 27 Oct 2020 19:47:19 +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.17.20]) (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 D772782361 for ; Tue, 27 Oct 2020 19:47:16 +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=1603824434; bh=VJ++wRGzt3aWI8k8u9ANVI932skibUa5hkAhzzlpNvQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=X/r1O9qXXJNJI1lbisZ5SQuXOd7qI/W7bfqvJ7v1xky7JKctQBw6hjOvxp2VkOUCd uOyBGrEpz8nauYdcUY1dyqpLxBNtcZi5tYpSlve7bX8gzbuvqR1B7eixJ1t0Pdx3Yw CEe8RYST4j+/PYRy7WqndCf9XbkOpCgaHt8ijNvE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation4.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MDQic-1khtqu31wk-00AWL7; Tue, 27 Oct 2020 19:47:14 +0100 From: Heinrich Schuchardt To: Simon Glass Cc: Rasmus Villemoes , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH v2 1/8] sandbox: eth-raw: do not close the console input Date: Tue, 27 Oct 2020 19:46:57 +0100 Message-Id: <20201027184704.15910-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201027184704.15910-1-xypron.glpk@gmx.de> References: <20201027184704.15910-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Hvq8S4NyazjKoRoSBSem6IN9eqGIs8MeeIKZQ5omvFTNXrzS5Y9 TXlMgFWVVADN4dqF2EyVDrNw29uLxn8zxF2oLePWP5p1efp8IZlCrnxl/8Z54gHk/qO95oU JksFmcGtuD4INXagl3EF94s8jQ8ZzDFiqYsIOdXWfYAJxaM/Kw+Rb1SiJVBBwjDCVwAIGEJ ITtLOOHRg1SqCnTK6RyAA== X-UI-Out-Filterresults: notjunk:1;V03:K0:n1XF8ZglrY0=:kGo+YyQIyb69G+RQ+uwhkV RzxUp5w7wlXrjWZE8cO019FCqh9jDPt2vvsgBhEBYGyckO0khnKi6dP5UB5oE+2aQjmLREhUT 5GTg3BHazhcbdbP2Jv4mWkeJcvwefmu5SdUG2kbrpqVHrC/8HFOjShfj9geWfQTjo3R6WzO89 jhorIT6l8FNSY+yLlNWbik/MOD/IQrBBHncFk/5Gc4pz4vh2uQODqZmfoHfHxj8LGn+/N7d1f Zy+VlrTxo+YkIBUdr2nGrcLe0vR5TSV3qXR0OyesnOA5qt6iaigOLri5RfGcpnXM3xMgAPiu8 YHl7n1gxfozD07NAKZrNC+gRAlbCUQiyrcbzbEXXg4nDu2uwqP2+LVtz83ti8oHMueMllbmBQ HrosnpkxTxpvlSkN8HMeP+NOlfhKAU4YSuExSGaMHsfp/wtG8XhQvIEDYVBJCHW+iKrW0djGe Y7MlcM4Q5rprc09U86IiWXW3Hz/H2UIELO9mBsJ2TTMu9m60lkWAJ9Vr4tppuCirM38tsNAvp cuB5pKPaaZI/RupnS53GrpheLP6LezsXaCy/pgYS8c0+QA2SQWih062l9WwbsN28h9a1+QCOi F9SWK2DA6Z8LerWr47lxZUaW098xaho7FnEVkpn4i7v0leB+ThNuMK8cFtRPpnuZtNe+I647h XiK6dAoKGa5qCHZm5qjWdiJ+24Nu7iFqJImyFx/pFtG3Aii45TmcKHNJOIY7ovJKTAnjDscqA I+3rR5DLNqZ0FZN/MobNWD6bwI+TnOD2PhEDX7XddYQAE4qh81IASKVP99rFFpkL7tdQ370TG RMX6qzGXd+o6n23J8m1lrJHuNc5siA05kTUM8NohKyM2YrMoNuRBLSLQyXBfSLkEKp7CULI7f unQaRY5jdd6CaSXwEHaw== 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 --- v2: no change --- 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)