aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r--kernel/nsproxy.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index ac8a56e90bf8..a05d191ffdd9 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -75,16 +75,11 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
75 goto out_uts; 75 goto out_uts;
76 } 76 }
77 77
78 new_nsp->ipc_ns = copy_ipcs(flags, tsk->nsproxy->ipc_ns); 78 new_nsp->ipc_ns = copy_ipcs(flags, tsk);
79 if (IS_ERR(new_nsp->ipc_ns)) { 79 if (IS_ERR(new_nsp->ipc_ns)) {
80 err = PTR_ERR(new_nsp->ipc_ns); 80 err = PTR_ERR(new_nsp->ipc_ns);
81 goto out_ipc; 81 goto out_ipc;
82 } 82 }
83 if (new_nsp->ipc_ns != tsk->nsproxy->ipc_ns) {
84 put_user_ns(new_nsp->ipc_ns->user_ns);
85 new_nsp->ipc_ns->user_ns = task_cred_xxx(tsk, user)->user_ns;
86 get_user_ns(new_nsp->ipc_ns->user_ns);
87 }
88 83
89 new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk)); 84 new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk));
90 if (IS_ERR(new_nsp->pid_ns)) { 85 if (IS_ERR(new_nsp->pid_ns)) {