diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-15 16:56:24 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-15 16:56:24 +0100 |
| commit | 02d75040897f37e43cc6df9a7084ecdd20526f1a (patch) | |
| tree | 4a2053c423751c4d72d0152f5c47acee08922f95 /kernel | |
| parent | Revert "exec: load_script: don't blindly truncate shebang string" (diff) | |
| parent | signal: Restore the stop PTRACE_EVENT_EXIT (diff) | |
| download | linux-02d75040897f37e43cc6df9a7084ecdd20526f1a.tar.xz linux-02d75040897f37e43cc6df9a7084ecdd20526f1a.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
Pull signal fix from Eric Biederman:
"Just a single patch that restores PTRACE_EVENT_EXIT functionality that
was accidentally broken by last weeks fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
signal: Restore the stop PTRACE_EVENT_EXIT
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/signal.c | 7 |
1 files changed, 5 insertions, 2 deletions
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(¤t->pending.signal, SIGKILL); + recalc_sigpending(); goto fatal; + } for (;;) { struct k_sigaction *ka; |