1 files changed, 8 insertions, 5 deletions

diff --git a/ipc/namespace.c b/ipc/namespace.c
index aa1889962693..3c3e5223e7e5 100644
--- a/ipc/namespace.c
+++ b/ipc/namespace.c
@@ -15,7 +15,8 @@
 
 #include "util.h"
 
-static struct ipc_namespace *create_ipc_ns(struct ipc_namespace *old_ns)
+static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk,
+                                           struct ipc_namespace *old_ns)
 {
         struct ipc_namespace *ns;
         int err;
@@ -44,17 +45,19 @@ static struct ipc_namespace *create_ipc_ns(struct ipc_namespace *old_ns)
         ipcns_notify(IPCNS_CREATED);
         register_ipcns_notifier(ns);
 
-        ns->user_ns = old_ns->user_ns;
-        get_user_ns(ns->user_ns);
+        ns->user_ns = get_user_ns(task_cred_xxx(tsk, user)->user_ns);
 
         return ns;
 }
 
-struct ipc_namespace *copy_ipcs(unsigned long flags, struct ipc_namespace *ns)
+struct ipc_namespace *copy_ipcs(unsigned long flags,
+                                struct task_struct *tsk)
 {
+        struct ipc_namespace *ns = tsk->nsproxy->ipc_ns;
+
         if (!(flags & CLONE_NEWIPC))
                 return get_ipc_ns(ns);
-        return create_ipc_ns(ns);
+        return create_ipc_ns(tsk, ns);
 }
 
 /*