diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-02 04:25:10 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-19 05:57:31 -0800 |
| commit | 49f4d8b93ccf9454284b6f524b96c66d8d7fbccc (patch) | |
| tree | 06540b59a9d302687fd0519239729c1612d0e2b7 /kernel/nsproxy.c | |
| parent | ae06c7c83fc6e97ba247a261921c101960f3d28f (diff) | |
| download | op-kernel-dev-49f4d8b93ccf9454284b6f524b96c66d8d7fbccc.zip op-kernel-dev-49f4d8b93ccf9454284b6f524b96c66d8d7fbccc.tar.gz | |
pidns: Capture the user namespace and filter ns_last_pid
- Capture the the user namespace that creates the pid namespace
- Use that user namespace to test if it is ok to write to
/proc/sys/kernel/ns_last_pid.
Zhao Hongjiang <zhaohongjiang@huawei.com> noticed I was missing a put_user_ns
in when destroying a pid_ns. I have foloded his patch into this one
so that bisects will work properly.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel/nsproxy.c')
| -rw-r--r-- | kernel/nsproxy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c index 7e1c3de..ca27d2c 100644 --- a/kernel/nsproxy.c +++ b/kernel/nsproxy.c @@ -84,7 +84,7 @@ static struct nsproxy *create_new_namespaces(unsigned long flags, goto out_ipc; } - new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk)); + new_nsp->pid_ns = copy_pid_ns(flags, task_cred_xxx(tsk, user_ns), task_active_pid_ns(tsk)); if (IS_ERR(new_nsp->pid_ns)) { err = PTR_ERR(new_nsp->pid_ns); goto out_pid; |
