Commit b17b0421 authored Nov 13, 2005 by Heiko Carstens Committed by Linus Torvalds Nov 13, 2005

[PATCH] signal handling: revert sigkill priority fix

This patch reverts commit c33880aa since
it's not needed anymore. As pointed out by Roland McGrath the real fix
is to deliver all signals before returning to user space.
See http://www.ussg.iu.edu/hypermail/linux/kernel/0509.2/0683.html


A fix for s390 has been merged.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Roland McGrath <roland@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent ba260e23

kernel/signal.c

+1 −10

Original line number	Diff line number	Diff line
		@@ -513,15 +513,6 @@ static int __dequeue_signal(struct sigpending pending, sigset_t mask,
		{
		int sig = 0;

		/* SIGKILL must have priority, otherwise it is quite easy
		* to create an unkillable process, sending sig < SIGKILL
		* to self */
		if (unlikely(sigismember(&pending->signal, SIGKILL))) {
		if (!sigismember(mask, SIGKILL))
		sig = SIGKILL;
		}

		if (likely(!sig))
		sig = next_signal(pending, mask);
		if (sig) {
		if (current->notifier) {

Admin message