mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

busybox: sysctl: ignore EIO of stable_secret below /proc/sys/net/ipv6/conf

Browse Source 
Avoid confusing messages caused by EIO on reading
/proc/sys/net/ipv6/conf/*/stable_secret if those are not set yet.
Make it behave the same as procps(>=3.3.13).

Fixes:
$ sysctl -a | grep ipv6.conf | grep stable_secret
sysctl: error reading key 'net.ipv6.conf.all.stable_secret': Input/output error
sysctl: error reading key 'net.ipv6.conf.default.stable_secret': Input/output error
sysctl: error reading key 'net.ipv6.conf.eth0.stable_secret': Input/output error
sysctl: error reading key 'net.ipv6.conf.lo.stable_secret': Input/output error

(From OE-Core rev: ff074f495dd4bb637618f790dd30e51e542cd30a)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yi Zhao
2020-04-04 17:11:08 +08:00
committed by Richard Purdie
parent c822e9b935
commit c94ce41660
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/busybox/busybox/0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch
+40
View File
@@ -0,0 +1,40 @@
From 3bee0460d74bad88eca6592e63ca926961b43b67 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Fri, 6 Mar 2020 16:09:26 +0800
Subject: [PATCH] sysctl: ignore EIO of stable_secret below
/proc/sys/net/ipv6/conf
Avoid confusing messages caused by EIO on reading
/proc/sys/net/ipv6/conf/*/stable_secret if those are not set yet.
Make it behave the same as procps(>=3.3.13).
Upstream-Status: Submitted [busybox@busybox.net mailing list]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
procps/sysctl.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/procps/sysctl.c b/procps/sysctl.c
index 6d77185ca..42c51cc91 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -202,7 +202,14 @@ static int sysctl_act_on_setting(char *setting)
value = cptr = xmalloc_read(fd, NULL);
close(fd);
if (value == NULL) {
- bb_perror_msg("error reading key '%s'", outname);
+ switch (errno) {
+ case EIO:
+ /* Ignore stable_secret below /proc/sys/net/ipv6/conf */
+ break;
+ default:
+ bb_perror_msg("error reading key '%s'", outname);
+ break;
+ }
retval = EXIT_FAILURE;
goto end;
}
--
2.17.1
meta/recipes-core/busybox/busybox_1.31.1.bb
+1
View File
@@ -47,6 +47,7 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
file://0003-runsv-Use-64-prefix-syscall-if-we-have-to.patch \
file://0001-Remove-syscall-wrappers-around-clock_gettime-closes-.patch \
file://0001-Remove-stime-function-calls.patch \
file://0001-sysctl-ignore-EIO-of-stable_secret-below-proc-sys-ne.patch \
"
SRC_URI_append_libc-musl = " file://musl.cfg "