[GIT PULL] signal fixes for v5.0-rc7

From: ebiederm@xmission.com (Eric W. Biederman)
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: <linux-kernel@vger.kernel.org>, Oleg Nesterov <oleg@redhat.com>,
	Ivan Delalande <colona@arista.com>
Subject: [GIT PULL] signal fixes for v5.0-rc7
Date: Thu, 14 Feb 2019 14:56:25 -0600	[thread overview]
Message-ID: <87pnru2io6.fsf@xmission.com> (raw)


Linus,

Please pull the for-linus branch from the git tree:

   git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git for-linus

   HEAD:cf43a757fd49442bc38f76088b70c2299eed2c2f signal: Restore the stop PTRACE_EVENT_EXIT

This includes just a single patch that restores PTRACE_EVENT_EXIT
functionality that was accidentally broken by last weeks fixes.

diff --git a/kernel/signal.c b/kernel/signal.c
index 99fa8ff06fd9..57b7771e20d7 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2436,9 +2436,12 @@ relock:
        }
 
        /* Has this task already been marked for death? */
-       ksig->info.si_signo = signr = SIGKILL;
-       if (signal_group_exit(signal))
+       if (signal_group_exit(signal)) {
+               ksig->info.si_signo = signr = SIGKILL;
+               sigdelset(&current->pending.signal, SIGKILL);
+               recalc_sigpending();
                goto fatal;
+       }
 
        for (;;) {
                struct k_sigaction *ka;
