From 6f868ed355ae577f49e6c4b560b8309b1c694f64 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Sun, 8 Jan 2006 01:03:09 -0800
Subject: [PATCH] --- yaml --- r: 16964 b: refs/heads/master c:
 0811af28ce49fab963e3e6b8abcf8c460f971cd4 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d5d67e615977..41b9ea64913c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54b21a7992a31d30c9a91f7e0a00ffdb4bd0caee
+refs/heads/master: 0811af28ce49fab963e3e6b8abcf8c460f971cd4
diff --git a/trunk/kernel/signal.c b/trunk/kernel/signal.c
index e20724af9b36..114cf9209bcd 100644
--- a/trunk/kernel/signal.c
+++ b/trunk/kernel/signal.c
@@ -1220,8 +1220,7 @@ int kill_proc_info_as_uid(int sig, struct siginfo *info, pid_t pid,
 		ret = -ESRCH;
 		goto out_unlock;
 	}
-	if ((!info || ((unsigned long)info != 1 &&
-			(unsigned long)info != 2 && SI_FROMUSER(info)))
+	if ((info == SEND_SIG_NOINFO || (!is_si_special(info) && SI_FROMUSER(info)))
 	    && (euid != p->suid) && (euid != p->uid)
 	    && (uid != p->suid) && (uid != p->uid)) {
 		ret = -EPERM;