From patchwork Tue Oct 27 19:29:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1388940 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=85.214.62.61; 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=B7yAJqmM; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CLMGn0B6Pz9sV1 for ; Wed, 28 Oct 2020 06:29:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8AFBE82361; Tue, 27 Oct 2020 20:29:49 +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="B7yAJqmM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5E289824BC; Tue, 27 Oct 2020 20:29:48 +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.21]) (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 044BE801D8 for ; Tue, 27 Oct 2020 20:29:46 +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=1603826984; bh=PoutpLhQ7gQTkH9SFIHLMLBEZqefv7sVh7q/0Et5ja8=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=B7yAJqmMuJ3TEs7CUtAllrwgQ9Q/aWYCBKiviziEPDtF/TzuOM6NP41Cr9xaskSaC hXORRvXncXjKsk0URoG7Br4v5xmi4/SGE3dy/k9yHRAiBRc10kIIWPN8HPCvpurZ7b DhuTG+/b1lb/5RBEFqOkbVD3EsgxI0QtFHVOWAZM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from workstation4.fritz.box ([178.202.41.107]) by mail.gmx.com (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MacOQ-1jwnKc0qqY-00cA7U; Tue, 27 Oct 2020 20:29:44 +0100 From: Heinrich Schuchardt To: Simon Glass Cc: Rasmus Villemoes , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH v3 1/8] sandbox: eth-raw: do not close the console input Date: Tue, 27 Oct 2020 20:29:21 +0100 Message-Id: <20201027192928.16508-2-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201027192928.16508-1-xypron.glpk@gmx.de> References: <20201027192928.16508-1-xypron.glpk@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:8ShR+0gWOK9nT2iCx46HS45e7T4TYH7h/UiiMpEifIN25dyWt34 vsK+juC0uU07NaBm+pgYWHyS7k4qMhcI+uzSi5+bnLfpeVUq9b0rGWVBTUpBSMMslz7y7NI 2tfhNh8pcDD4fTvHEq/+25Bwa3tQjZO3SfHmcJD7iR8eo70pP2R1Yaqn4BLMX+VpS0kbIlL cROZ/CcCwqyQ26OgXM5gQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:wFv7Fqh6rAg=:apBvz9+Xmpy1UwmT4iG1rE yG9Jl17ZNKvF30kKjrerY1MVaZ1eCkpjNMwYSnvUjnLPvE8gTr/LVBlx+/uDZdqqj+/G4etUY 5LPbrXRvSmgvzo0qidm32/U/zKAbt2N0MukCG6YdSM1ESwbadCiTCIevTeGDahFKggMT1ecuD guoH0yEXkJHfbD6KksrxwB99o3DWbaVlnXeafZnrKIQxOtrtQCOVbvVfui2XV3BIQkccR7MX5 B/mn9n2RLSQcrhMIaADSwYfvcomF55VKQrzVdT5xQoW0p8AEETLvzTgLWS/gQlH3l0deY3L5K Rj5MUWQOiq6a2si4hTKXuaKREMgBnlnKoLT/OYwlEhyhOe0QKQ5sbURwFQSeaOp3jqLYDWgtV cEQFDIxVWgmo/KcyhCfQzGmQS7dpDNpxvTWLQfetrVAkLeKUbGfrBNW7+TcPHO1E3D3hlQwH5 dWDRiGC/0DZULlFEEPdzGwseIjLcKcknj6KZbVuHXZnhen4CFmt5gro7g+Y+noKtVb1UKNlM9 Cy0cHYmh2CRR7u4MzdmdEKm1U3/0ICvRzDbkCInJWlDzdbnzTxFvuvWmadY5yfL1fE+nY8/35 u/Lej80TxzFu3fJFIlLrRfLsVOTTzh+YpcSGA0DNbi+TW3ahFDuw4ZKBXkwClcEiXKFtTwsfP fhg8mCU6DDYu1FXO0Id7+dgyu1s/8lIY6q1Y6nbP//uufbVViyaYSKcSr70yjHmbyXgDstsZL 0q9Vx3MUbi8Z3ZD7qqMnsvtmEw2PRzijEjPLt6un1B6L1zudJDmxwUT1Pdx3VJj+1MfYPOToI VnDaCdfhWpPoN9RGydZ/WRd0MzGGjMk7PXfUSJQTHwCM38Ufpg9UWNDqkgNn1EE3kfpuNS3T+ sjlaSHyjpeISh7dsAjsg== 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 Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- v3: no change 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)