[PATCH v2 1/8] sandbox: eth-raw: do not close the console input
Heinrich Schuchardt
xypron.glpk at gmx.de
Tue Oct 27 19:46:57 CET 2020
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 <xypron.glpk at gmx.de>
Reviewed-by: Simon Glass <sjg at chromium.org>
---
v2:
no change
---
arch/sandbox/cpu/eth-raw-os.c | 8 ++++----
arch/sandbox/cpu/os.c | 5 ++++-
2 files changed, 8 insertions(+), 5 deletions(-)
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)
--
2.28.0
More information about the U-Boot
mailing list