---

yaml --- r: 1340 b: refs/heads/master c: c33880a h: refs/heads/master v: v3
git-mirror · May 25, 2005 · ea9e10c · ea9e10c
1 parent b6c2785
commit ea9e10c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6431e6a28e8df423e1ebcda065e9ff086198d2c6
+refs/heads/master: c33880aaddbbab1ccf36f4457ed1090621f2e39a
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -522,7 +522,16 @@ static int __dequeue_signal(struct sigpending *pending, sigset_t *mask,
 {
 	int sig = 0;
 
-	sig = next_signal(pending, mask);
+	/* 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) {
 			if (sigismember(current->notifier_mask, sig)) {