---

yaml --- r: 176685 b: refs/heads/master c: dd34200 h: refs/heads/master i: 176683: 5a4853e v: v3
git-mirror · Dec 16, 2009 · e2a1d9c · e2a1d9c
1 parent 2091616
commit e2a1d9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 614c517d7c00af1b26ded20646b329397d6f51a1
+refs/heads/master: dd34200adc01c5217ef09b55905b5c2312d65535
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
@@ -960,9 +960,8 @@ static int send_signal(int sig, struct siginfo *info, struct task_struct *t,
 	int from_ancestor_ns = 0;
 
 #ifdef CONFIG_PID_NS
-	if (!is_si_special(info) && SI_FROMUSER(info) &&
-			task_pid_nr_ns(current, task_active_pid_ns(t)) <= 0)
-		from_ancestor_ns = 1;
+	from_ancestor_ns = si_fromuser(info) &&
+			   !task_pid_nr_ns(current, task_active_pid_ns(t));
 #endif
 
 	return __send_signal(sig, info, t, group, from_ancestor_ns);