X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=security%2Fcommoncap.c;h=5a5ef5ca7ea97eb9a2ef3901e3faff71fcaefcc6;hb=0c7d3757116c59b3eedd9aa6dfd7ae0a1341f5c2;hp=f50fc298cf801991879bee1de094dd56671562c3;hpb=c0bc8721b8d0380ec69fa97578c91201201b05a9;p=linux-2.6

diff --git a/security/commoncap.c b/security/commoncap.c
index f50fc298cf..5a5ef5ca7e 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -169,7 +169,7 @@ void cap_bprm_apply_creds (struct linux_binprm *bprm, int unsafe)
 	/* For init, we want to retain the capabilities set
 	 * in the init_task struct. Thus we skip the usual
 	 * capability rules */
-	if (current->pid != 1) {
+	if (!is_init(current)) {
 		current->cap_permitted = new_permitted;
 		current->cap_effective =
 		    cap_intersect (new_permitted, bprm->cap_effective);