From e2a1d9c181a5677a8599fa1f0f625f3a023a73c0 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@redhat.com>
Date: Tue, 15 Dec 2009 16:47:24 -0800
Subject: [PATCH] --- yaml --- r: 176685 b: refs/heads/master c:
 dd34200adc01c5217ef09b55905b5c2312d65535 h: refs/heads/master i:   176683:
 5a4853ec1ba1fbbe981b2757987389eb56f6535e v: v3

---
 [refs]                | 2 +-
 trunk/kernel/signal.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c5878a168f92..5a85d4f0450a 100644
--- 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
index a0ba428954b6..b65879d4e08f 100644
--- 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);