[Buildroot] [git commit master 1/1] busybox 1.18.3: add patches for klogd and menuconfig
Peter Korsgaard
jacmet at sunsite.dk
Thu Mar 10 13:39:57 UTC 2011
commit: http://git.buildroot.net/buildroot/commit/?id=eb2ebf949007b8a608d0624c764a67a2fbcb9fd6
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
---
.../busybox-1.18.3/busybox-1.18.3-klogd.patch | 45 ++++++++++++++++++++
.../busybox-1.18.3/busybox-1.18.3-menuconfig.patch | 11 +++++
2 files changed, 56 insertions(+), 0 deletions(-)
create mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
create mode 100644 package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
new file mode 100644
index 0000000..2272cd0
--- /dev/null
+++ b/package/busybox/busybox-1.18.3/busybox-1.18.3-klogd.patch
@@ -0,0 +1,45 @@
+--- busybox-1.18.3/sysklogd/klogd.c
++++ busybox-1.18.3-klogd/sysklogd/klogd.c
+@@ -150,12 +150,41 @@ int klogd_main(int argc UNUSED_PARAM, ch
+ */
+ klogd_open();
+ openlog("kernel", 0, LOG_KERN);
++ /*
++ * glibc problem: for some reason, glibc changes LOG_KERN to LOG_USER
++ * above. The logic behind this is that standard
++ * http://pubs.opengroup.org/onlinepubs/9699919799/functions/syslog.html
++ * says the following about openlog and syslog:
++ * "LOG_USER
++ * Messages generated by arbitrary processes.
++ * This is the default facility identifier if none is specified."
++ *
++ * I believe glibc misinterpreted this text as "if openlog's
++ * third parameter is 0 (=LOG_KERN), treat it as LOG_USER".
++ * Whereas it was meant to say "if *syslog* is called with facility
++ * 0 in its 1st parameter without prior call to openlog, then perform
++ * implicit openlog(LOG_USER)".
++ *
++ * As a result of this, eh, feature, standard klogd was forced
++ * to open-code its own openlog and syslog implementation (!).
++ *
++ * Note that prohibiting openlog(LOG_KERN) on libc level does not
++ * add any security: any process can open a socket to "/dev/log"
++ * and write a string "<0>Voila, a LOG_KERN + LOG_EMERG message"
++ *
++ * Google code search tells me there is no widespread use of
++ * openlog("foo", 0, 0), thus fixing glibc won't break userspace.
++ *
++ * The bug against glibc was filed:
++ * bugzilla.redhat.com/show_bug.cgi?id=547000
++ */
+
+ if (i)
+ klogd_setloglevel(i);
+
+- bb_signals(BB_FATAL_SIGS, record_signo);
+ signal(SIGHUP, SIG_IGN);
++ /* We want klogd_read to not be restarted, thus _norestart: */
++ bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo);
+
+ syslog(LOG_NOTICE, "klogd started: %s", bb_banner);
+
diff --git a/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch b/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
new file mode 100644
index 0000000..3fc3eda
--- /dev/null
+++ b/package/busybox/busybox-1.18.3/busybox-1.18.3-menuconfig.patch
@@ -0,0 +1,11 @@
+--- busybox-1.18.3/scripts/kconfig/mconf.c
++++ busybox-1.18.3-menuconfig/scripts/kconfig/mconf.c
+@@ -256,7 +256,7 @@ search_help[] = N_(
+ " USB$ => find all CONFIG_ symbols ending with USB\n"
+ "\n");
+
+-static char buf[4096], *bufptr = buf;
++static char buf[4096*10], *bufptr = buf;
+ static char input_buf[4096];
+ static const char filename[] = ".config";
+ static char *args[1024], **argptr = args;
--
1.7.3.4
More information about the buildroot
mailing list