public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL] signal fixes for v5.0-rc7
@ 2019-02-14 20:56 Eric W. Biederman
  2019-02-15 17:10 ` pr-tracker-bot
  0 siblings, 1 reply; 2+ messages in thread
From: Eric W. Biederman @ 2019-02-14 20:56 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, Oleg Nesterov, Ivan Delalande


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;

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [GIT PULL] signal fixes for v5.0-rc7
  2019-02-14 20:56 [GIT PULL] signal fixes for v5.0-rc7 Eric W. Biederman
@ 2019-02-15 17:10 ` pr-tracker-bot
  0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2019-02-15 17:10 UTC (permalink / raw)
  To: Eric W. Biederman
  Cc: Linus Torvalds, linux-kernel, Oleg Nesterov, Ivan Delalande

The pull request you sent on Thu, 14 Feb 2019 14:56:25 -0600:

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

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/02d75040897f37e43cc6df9a7084ecdd20526f1a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-02-15 17:10 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-14 20:56 [GIT PULL] signal fixes for v5.0-rc7 Eric W. Biederman
2019-02-15 17:10 ` pr-tracker-bot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox