Commit eb61b591 authored Aug 18, 2017 by Jamie Iles Committed by Linus Torvalds Aug 18, 2017

signal: don't remove SIGNAL_UNKILLABLE for traced tasks.

When forcing a signal, SIGNAL_UNKILLABLE is removed to prevent recursive
faults, but this is undesirable when tracing.  For example, debugging an
init process (whether global or namespace), hitting a breakpoint and
SIGTRAP will force SIGTRAP and then remove SIGNAL_UNKILLABLE.
Everything continues fine, but then once debugging has finished, the
init process is left killable which is unlikely what the user expects,
resulting in either an accidentally killed init or an init that stops
reaping zombies.

Link: http://lkml.kernel.org/r/20170815112806.10728-1-jamie.iles@oracle.com


Signed-off-by: Jamie Iles <jamie.iles@oracle.com>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 6b31d595

kernel/signal.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1194,7 +1194,11 @@ force_sig_info(int sig, struct siginfo info, struct task_struct t)
		recalc_sigpending_and_wake(t);
		}
		}
		if (action->sa.sa_handler == SIG_DFL)
		/*
		* Don't clear SIGNAL_UNKILLABLE for traced tasks, users won't expect
		* debugging to leave init killable.
		*/
		if (action->sa.sa_handler == SIG_DFL && !t->ptrace)
		t->signal->flags &= ~SIGNAL_UNKILLABLE;
		ret = specific_send_sig_info(sig, info, t);
		spin_unlock_irqrestore(&t->sighand->siglock, flags);

Admin message