Commit 02d75040 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
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
parents cb5b020a cf43a757
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -2436,9 +2436,12 @@ relock:
	}

	/* Has this task already been marked for death? */
	if (signal_group_exit(signal)) {
		ksig->info.si_signo = signr = SIGKILL;
	if (signal_group_exit(signal))
		sigdelset(&current->pending.signal, SIGKILL);
		recalc_sigpending();
		goto fatal;
	}

	for (;;) {
		struct k_sigaction *ka;