diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2012-08-02 07:25:10 -0400 |
---|---|---|
committer | Eric W. Biederman <ebiederm@xmission.com> | 2012-11-19 08:57:31 -0500 |
commit | 49f4d8b93ccf9454284b6f524b96c66d8d7fbccc (patch) | |
tree | 06540b59a9d302687fd0519239729c1612d0e2b7 /kernel/pid.c | |
parent | ae06c7c83fc6e97ba247a261921c101960f3d28f (diff) |
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/pid.c')
-rw-r--r-- | kernel/pid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index aebd4f5aaf41..2a624f1486e1 100644 --- a/kernel/pid.c +++ b/kernel/pid.c | |||
@@ -78,6 +78,7 @@ struct pid_namespace init_pid_ns = { | |||
78 | .last_pid = 0, | 78 | .last_pid = 0, |
79 | .level = 0, | 79 | .level = 0, |
80 | .child_reaper = &init_task, | 80 | .child_reaper = &init_task, |
81 | .user_ns = &init_user_ns, | ||
81 | }; | 82 | }; |
82 | EXPORT_SYMBOL_GPL(init_pid_ns); | 83 | EXPORT_SYMBOL_GPL(init_pid_ns); |
83 | 84 | ||