pid namespaces: define is_global_init() and is_container_init()

[mirror_ubuntu-artful-kernel.git] / security / commoncap.c

diff --git a/security/commoncap.c b/security/commoncap.c
index 48ca5b092768fdde28e1df98b6420e47af0e82b1..43f902750a1b6c802d650b6e9bbafde70ec8ae70 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -23,6 +23,7 @@
 #include <linux/xattr.h>
 #include <linux/hugetlb.h>
 #include <linux/mount.h>
+#include <linux/sched.h>
 
 #ifdef CONFIG_SECURITY_FILE_CAPABILITIES
 /*
@@ -334,7 +335,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 (!is_init(current)) {
+       if (!is_global_init(current)) {
                current->cap_permitted = new_permitted;
                current->cap_effective = bprm->cap_effective ?
                                new_permitted : 0;