signals: protect cinit from blocked fatal signals
Normally SIG_DFL signals to global and container-init are dropped early. But if a signal is blocked when it is posted, we cannot drop the signal since the receiver may install a handler before unblocking the signal. Once this signal is queued however, the receiver container-init has no way of knowing if the signal was sent from an ancestor or descendant namespace. This patch ensures that contianer-init drops all SIG_DFL signals in get_signal_to_deliver() except SIGKILL/SIGSTOP. If SIGSTOP/SIGKILL originate from a descendant of container-init they are never queued (i.e dropped in sig_ignored() in an earler patch). If SIGSTOP/SIGKILL originate from parent namespace, the signal is queued and container-init processes the signal. IOW, if get_signal_to_deliver() sees a sig_kernel_only() signal for global or container-init, the signal must have been generated internally or must have come from an ancestor ns and we process the signal. Further, the signal_group_exit() check was needed to cover the case of a multi-threaded init sending SIGKILL to other threads when doing an exit() or exec(). But since the new sig_kernel_only() check covers the SIGKILL, the signal_group_exit() check is no longer needed and can be removed. Finally, now that we have all pieces in place, set SIGNAL_UNKILLABLE for container-inits. Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Cc: Oleg Nesterov <oleg@tv-sign.ru> Cc: Roland McGrath <roland@redhat.com> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Cc: Daniel Lezcano <daniel.lezcano@free.fr> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e4da026f98
commit
b3bfa0cba8
|
@ -841,6 +841,8 @@ static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
|
|||
atomic_set(&sig->live, 1);
|
||||
init_waitqueue_head(&sig->wait_chldexit);
|
||||
sig->flags = 0;
|
||||
if (clone_flags & CLONE_NEWPID)
|
||||
sig->flags |= SIGNAL_UNKILLABLE;
|
||||
sig->group_exit_code = 0;
|
||||
sig->group_exit_task = NULL;
|
||||
sig->group_stop_count = 0;
|
||||
|
|
|
@ -1870,9 +1870,16 @@ relock:
|
|||
|
||||
/*
|
||||
* Global init gets no signals it doesn't want.
|
||||
* Container-init gets no signals it doesn't want from same
|
||||
* container.
|
||||
*
|
||||
* Note that if global/container-init sees a sig_kernel_only()
|
||||
* signal here, the signal must have been generated internally
|
||||
* or must have come from an ancestor namespace. In either
|
||||
* case, the signal cannot be dropped.
|
||||
*/
|
||||
if (unlikely(signal->flags & SIGNAL_UNKILLABLE) &&
|
||||
!signal_group_exit(signal))
|
||||
!sig_kernel_only(signr))
|
||||
continue;
|
||||
|
||||
if (sig_kernel_stop(signr)) {
|
||||
|
|
Loading…
Reference in New Issue