aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/nsproxy.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/nsproxy.c')
-rw-r--r--kernel/nsproxy.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index b97fc9d04dd..ac8a56e90bf 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -80,6 +80,11 @@ static struct nsproxy *create_new_namespaces(unsigned long flags,
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 }
83 88
84 new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk)); 89 new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk));
85 if (IS_ERR(new_nsp->pid_ns)) { 90 if (IS_ERR(new_nsp->pid_ns)) {