From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Sun, 8 Jan 2006 09:03:09 +0000 (-0800)
Subject: [PATCH] kill_proc_info_as_uid: don't use hardcoded constants
X-Git-Tag: v2.6.16-rc1~765
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0811af28ce49fab963e3e6b8abcf8c460f971cd4;p=linux-2.6

[PATCH] kill_proc_info_as_uid: don't use hardcoded constants

Use symbolic names instead of hardcoded constants.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Harald Welte <laforge@gnumonks.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/kernel/signal.c b/kernel/signal.c
index e20724af9b..114cf9209b 100644
--- a/kernel/signal.c
+++ b/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;