diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2007-05-09 05:34:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-09 15:30:53 -0400 |
commit | 10ab825bdef8df510f99c703a5a2d9b13a4e31a5 (patch) | |
tree | e4db81f26c03ba5a5bff43ed44646a4ed4509d67 /kernel/kthread.c | |
parent | 5de18d169739293e27e0cf9acfc75a2d2f4aa572 (diff) |
change kernel threads to ignore signals instead of blocking them
Currently kernel threads use sigprocmask(SIG_BLOCK) to protect against
signals. This doesn't prevent the signal delivery, this only blocks
signal_wake_up(). Every "killall -33 kthreadd" means a "struct siginfo"
leak.
Change kthreadd_setup() to set all handlers to SIG_IGN instead of blocking
them (make a new helper ignore_signals() for that). If the kernel thread
needs some signal, it should use allow_signal() anyway, and in that case it
should not use CLONE_SIGHAND.
Note that we can't change daemonize() (should die!) in the same way,
because it can be used along with CLONE_SIGHAND. This means that
allow_signal() still should unblock the signal to work correctly with
daemonize()ed threads.
However, disallow_signal() doesn't block the signal any longer but ignores
it.
NOTE: with or without this patch the kernel threads are not protected from
handle_stop_signal(), this seems harmless, but not good.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/kthread.c')
-rw-r--r-- | kernel/kthread.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/kernel/kthread.c b/kernel/kthread.c index 0eb0070a3c57..df8a8e8f6ca4 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c | |||
@@ -215,24 +215,13 @@ EXPORT_SYMBOL(kthread_stop); | |||
215 | static __init void kthreadd_setup(void) | 215 | static __init void kthreadd_setup(void) |
216 | { | 216 | { |
217 | struct task_struct *tsk = current; | 217 | struct task_struct *tsk = current; |
218 | struct k_sigaction sa; | ||
219 | sigset_t blocked; | ||
220 | 218 | ||
221 | set_task_comm(tsk, "kthreadd"); | 219 | set_task_comm(tsk, "kthreadd"); |
222 | 220 | ||
223 | /* Block and flush all signals */ | 221 | ignore_signals(tsk); |
224 | sigfillset(&blocked); | ||
225 | sigprocmask(SIG_BLOCK, &blocked, NULL); | ||
226 | flush_signals(tsk); | ||
227 | 222 | ||
228 | /* SIG_IGN makes children autoreap: see do_notify_parent(). */ | 223 | set_user_nice(tsk, -5); |
229 | sa.sa.sa_handler = SIG_IGN; | 224 | set_cpus_allowed(tsk, CPU_MASK_ALL); |
230 | sa.sa.sa_flags = 0; | ||
231 | siginitset(&sa.sa.sa_mask, sigmask(SIGCHLD)); | ||
232 | do_sigaction(SIGCHLD, &sa, (struct k_sigaction *)0); | ||
233 | |||
234 | set_user_nice(current, -5); | ||
235 | set_cpus_allowed(current, CPU_MASK_ALL); | ||
236 | } | 225 | } |
237 | 226 | ||
238 | int kthreadd(void *unused) | 227 | int kthreadd(void *unused) |