module, async: async_synchronize_full() on module init iff async is used

[karo-tx-linux.git] / kernel / user_namespace.c

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index ce92f7e6290a9016fad84d014a81e6907eaa5ec5..2b042c42fbc415b24beb45b095fc6059612de0f8 100644 (file)
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -58,6 +58,7 @@ int create_user_ns(struct cred *new)
        struct user_namespace *ns, *parent_ns = new->user_ns;
        kuid_t owner = new->euid;
        kgid_t group = new->egid;
+       int ret;
 
        /* The creator needs a mapping in the parent user namespace
         * or else we won't be able to reasonably tell userspace who
@@ -71,6 +72,12 @@ int create_user_ns(struct cred *new)
        if (!ns)
                return -ENOMEM;
 
+       ret = proc_alloc_inum(&ns->proc_inum);
+       if (ret) {
+               kmem_cache_free(user_ns_cachep, ns);
+               return ret;
+       }
+
        kref_init(&ns->kref);
        /* Leave the new->user_ns reference with the new user namespace. */
        ns->parent = parent_ns;
@@ -103,6 +110,7 @@ void free_user_ns(struct kref *kref)
                container_of(kref, struct user_namespace, kref);
 
        parent = ns->parent;
+       proc_free_inum(ns->proc_inum);
        kmem_cache_free(user_ns_cachep, ns);
        put_user_ns(parent);
 }
@@ -391,7 +399,7 @@ static int uid_m_show(struct seq_file *seq, void *v)
        struct user_namespace *lower_ns;
        uid_t lower;
 
-       lower_ns = current_user_ns();
+       lower_ns = seq_user_ns(seq);
        if ((lower_ns == ns) && lower_ns->parent)
                lower_ns = lower_ns->parent;
 
@@ -412,7 +420,7 @@ static int gid_m_show(struct seq_file *seq, void *v)
        struct user_namespace *lower_ns;
        gid_t lower;
 
-       lower_ns = current_user_ns();
+       lower_ns = seq_user_ns(seq);
        if ((lower_ns == ns) && lower_ns->parent)
                lower_ns = lower_ns->parent;
 
@@ -688,10 +696,14 @@ ssize_t proc_uid_map_write(struct file *file, const char __user *buf, size_t siz
 {
        struct seq_file *seq = file->private_data;
        struct user_namespace *ns = seq->private;
+       struct user_namespace *seq_ns = seq_user_ns(seq);
 
        if (!ns->parent)
                return -EPERM;
 
+       if ((seq_ns != ns) && (seq_ns != ns->parent))
+               return -EPERM;
+
        return map_write(file, buf, size, ppos, CAP_SETUID,
                         &ns->uid_map, &ns->parent->uid_map);
 }
@@ -700,10 +712,14 @@ ssize_t proc_gid_map_write(struct file *file, const char __user *buf, size_t siz
 {
        struct seq_file *seq = file->private_data;
        struct user_namespace *ns = seq->private;
+       struct user_namespace *seq_ns = seq_user_ns(seq);
 
        if (!ns->parent)
                return -EPERM;
 
+       if ((seq_ns != ns) && (seq_ns != ns->parent))
+               return -EPERM;
+
        return map_write(file, buf, size, ppos, CAP_SETGID,
                         &ns->gid_map, &ns->parent->gid_map);
 }
@@ -783,7 +799,7 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
        if (user_ns == current_user_ns())
                return -EINVAL;
 
-       /* Threaded many not enter a different user namespace */
+       /* Threaded processes may not enter a different user namespace */
        if (atomic_read(&current->mm->mm_users) > 1)
                return -EINVAL;
 
@@ -800,12 +816,19 @@ static int userns_install(struct nsproxy *nsproxy, void *ns)
        return commit_creds(cred);
 }
 
+static unsigned int userns_inum(void *ns)
+{
+       struct user_namespace *user_ns = ns;
+       return user_ns->proc_inum;
+}
+
 const struct proc_ns_operations userns_operations = {
        .name           = "user",
        .type           = CLONE_NEWUSER,
        .get            = userns_get,
        .put            = userns_put,
        .install        = userns_install,
+       .inum           = userns_inum,
 };
 
 static __init int user_namespaces_init(void)