1 files changed, 4 insertions, 9 deletions

diff --git a/security/commoncap.c b/security/commoncap.c
index f20e984ccfb4..a93b3b733079 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;
 
         /*