Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / ipc / namespace.c

diff --git a/ipc/namespace.c b/ipc/namespace.c
index 068caf18d56509711e46b47b25a363254d681abe..04cb07eb81f1c148c43915e1eecd57b3cfe9699e 100644 (file)
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -34,8 +34,11 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
        ns->ns.ops = &ipcns_operations;
 
        atomic_set(&ns->count, 1);
+       ns->user_ns = get_user_ns(user_ns);
+
        err = mq_init_ns(ns);
        if (err) {
+               put_user_ns(ns->user_ns);
                ns_free_inum(&ns->ns);
                kfree(ns);
                return ERR_PTR(err);
@@ -46,8 +49,6 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns,
        msg_init_ns(ns);
        shm_init_ns(ns);
 
-       ns->user_ns = get_user_ns(user_ns);
-
        return ns;
 }