X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=security%2Fcommoncap.c;h=a93b3b73307991c69738bc0dab712e56330ba932;hb=35806b4f7c5620b547f183e9d53f7cfaeabb582b;hp=f20e984ccfb459c141222f51791f4b5a3fcab6a9;hpb=255bae73b214f143a3c7cc74d4792eb166a10d46;p=mv-sheeva.git

diff --git a/security/commoncap.c b/security/commoncap.c
index f20e984ccfb..a93b3b73307 100644
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -529,15 +529,10 @@ skip:
 	new->suid = new->fsuid = new->euid;
 	new->sgid = new->fsgid = new->egid;
 
-	/* For init, we want to retain the capabilities set in the initial
-	 * task.  Thus we skip the usual capability rules
-	 */
-	if (!is_global_init(current)) {
-		if (effective)
-			new->cap_effective = new->cap_permitted;
-		else
-			cap_clear(new->cap_effective);
-	}
+	if (effective)
+		new->cap_effective = new->cap_permitted;
+	else
+		cap_clear(new->cap_effective);
 	bprm->cap_effective = effective;
 
 	/*