Skip to contentSkip to conversation

signal handling: revert sigkill priority fix

PATCH New Heiko Carstens 1 participant 1 message Nov 5, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 signal handling: revert sigkill priority fix

From: Heiko Carstens <[email protected]>

This patch reverts commit c33880aaddbbab1ccf36f4457ed1090621f2e39a 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 is in the -mm tree.

---

 kernel/signal.c |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
kernel/signal.c +1 -10
index 1bf3c39..2429204 100644
@@ -513,16 +513,7 @@ static int __dequeue_signal(struct sigpe
 {
 	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);
+	sig = next_signal(pending, mask);
 	if (sig) {
 		if (current->notifier) {
 			if (sigismember(current->notifier_mask, sig)) {