pid namespaces: define is_global_init() and is_container_init()

[mirror_ubuntu-artful-kernel.git] / kernel / capability.c

diff --git a/kernel/capability.c b/kernel/capability.c
index cbc5fd60c0f318dce6c1cdcd33b4cf5b5d37f6a1..f02ad47320b92c9536d2c287f2bfb6a72c8a1ef2 100644 (file)
--- a/kernel/capability.c
+++ b/kernel/capability.c
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/pid_namespace.h>
 #include <asm/uaccess.h>
 
 /*
@@ -129,7 +130,7 @@ static inline int cap_set_all(kernel_cap_t *effective,
      int found = 0;
 
      do_each_thread(g, target) {
-             if (target == current || is_init(target))
+             if (target == current || is_container_init(target->group_leader))
                      continue;
              found = 1;
             if (security_capset_check(target, effective, inheritable,