userns: Start out with a full set of capabilities.

Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index c15e533d6bc54f5e4f90402c00accec94a828647..e216e1e8ce84a7f9ba3840de0d4f6d8c2c32ec4c 100644 (file)
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -11,6 +11,7 @@
 #include <linux/user_namespace.h>
 #include <linux/highuid.h>
 #include <linux/cred.h>
+#include <linux/securebits.h>
 
 static struct kmem_cache *user_ns_cachep __read_mostly;
 
@@ -52,6 +53,14 @@ int create_user_ns(struct cred *new)
        new->gid = new->egid = new->sgid = new->fsgid = 0;
        put_group_info(new->group_info);
        new->group_info = get_group_info(&init_groups);
+       /* Start with the same capabilities as init but useless for doing
+        * anything as the capabilities are bound to the new user namespace.
+        */
+       new->securebits = SECUREBITS_DEFAULT;
+       new->cap_inheritable = CAP_EMPTY_SET;
+       new->cap_permitted = CAP_FULL_SET;
+       new->cap_effective = CAP_FULL_SET;
+       new->cap_bset = CAP_FULL_SET;
 #ifdef CONFIG_KEYS
        key_put(new->request_key_auth);
        new->request_key_auth = NULL;