X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=security%2Fcommoncap.c;h=5a5ef5ca7ea97eb9a2ef3901e3faff71fcaefcc6;hb=60b2a46cd60c54bd6551ddfa01f0aab08ca58a5d;hp=f50fc298cf801991879bee1de094dd56671562c3;hpb=ba290ab7dace8b3339c0cc86c221d48eed21e956;p=powerpc.git

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);