diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-03-13 02:39:10 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-03-13 02:39:10 +0100 |
commit | 30f0ea6cab956ed59ecc5de82459187763a2b868 (patch) | |
tree | 2f93977a3de79ff6b517b2a291b643502267ccc9 /sysklogd | |
parent | 92e531458a6c0e6464fbdc1463f91edc7fb752c7 (diff) | |
download | busybox-w32-1_18_4.tar.gz busybox-w32-1_18_4.tar.bz2 busybox-w32-1_18_4.zip |
Apply post-1.18.3 fixes, bump version to 1.18.41_18_4
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'sysklogd')
-rw-r--r-- | sysklogd/klogd.c | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index 0d4c2578d..db32065fb 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c | |||
@@ -150,12 +150,41 @@ int klogd_main(int argc UNUSED_PARAM, char **argv) | |||
150 | */ | 150 | */ |
151 | klogd_open(); | 151 | klogd_open(); |
152 | openlog("kernel", 0, LOG_KERN); | 152 | openlog("kernel", 0, LOG_KERN); |
153 | /* | ||
154 | * glibc problem: for some reason, glibc changes LOG_KERN to LOG_USER | ||
155 | * above. The logic behind this is that standard | ||
156 | * http://pubs.opengroup.org/onlinepubs/9699919799/functions/syslog.html | ||
157 | * says the following about openlog and syslog: | ||
158 | * "LOG_USER | ||
159 | * Messages generated by arbitrary processes. | ||
160 | * This is the default facility identifier if none is specified." | ||
161 | * | ||
162 | * I believe glibc misinterpreted this text as "if openlog's | ||
163 | * third parameter is 0 (=LOG_KERN), treat it as LOG_USER". | ||
164 | * Whereas it was meant to say "if *syslog* is called with facility | ||
165 | * 0 in its 1st parameter without prior call to openlog, then perform | ||
166 | * implicit openlog(LOG_USER)". | ||
167 | * | ||
168 | * As a result of this, eh, feature, standard klogd was forced | ||
169 | * to open-code its own openlog and syslog implementation (!). | ||
170 | * | ||
171 | * Note that prohibiting openlog(LOG_KERN) on libc level does not | ||
172 | * add any security: any process can open a socket to "/dev/log" | ||
173 | * and write a string "<0>Voila, a LOG_KERN + LOG_EMERG message" | ||
174 | * | ||
175 | * Google code search tells me there is no widespread use of | ||
176 | * openlog("foo", 0, 0), thus fixing glibc won't break userspace. | ||
177 | * | ||
178 | * The bug against glibc was filed: | ||
179 | * bugzilla.redhat.com/show_bug.cgi?id=547000 | ||
180 | */ | ||
153 | 181 | ||
154 | if (i) | 182 | if (i) |
155 | klogd_setloglevel(i); | 183 | klogd_setloglevel(i); |
156 | 184 | ||
157 | bb_signals(BB_FATAL_SIGS, record_signo); | ||
158 | signal(SIGHUP, SIG_IGN); | 185 | signal(SIGHUP, SIG_IGN); |
186 | /* We want klogd_read to not be restarted, thus _norestart: */ | ||
187 | bb_signals_recursive_norestart(BB_FATAL_SIGS, record_signo); | ||
159 | 188 | ||
160 | syslog(LOG_NOTICE, "klogd started: %s", bb_banner); | 189 | syslog(LOG_NOTICE, "klogd started: %s", bb_banner); |
161 | 190 | ||