diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2013-03-05 13:59:48 -0800 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2013-08-30 23:44:00 -0700 |
| commit | 6e556ce209b09528dbf1931cbfd5d323e1345926 (patch) | |
| tree | 5920aa522bb1be12f8c4c458c44d792f72ea3674 /kernel | |
| parent | 160da84dbb39443fdade7151bc63a88f8e953077 (diff) | |
| download | op-kernel-dev-6e556ce209b09528dbf1931cbfd5d323e1345926.zip op-kernel-dev-6e556ce209b09528dbf1931cbfd5d323e1345926.tar.gz | |
pidns: Don't have unshare(CLONE_NEWPID) imply CLONE_THREAD
I goofed when I made unshare(CLONE_NEWPID) only work in a
single-threaded process. There is no need for that requirement and in
fact I analyzied things right for setns. The hard requirement
is for tasks that share a VM to all be in the pid namespace and
we properly prevent that in do_fork.
Just to be certain I took a look through do_wait and
forget_original_parent and there are no cases that make it any harder
for children to be in the multiple pid namespaces than it is for
children to be in the same pid namespace. I also performed a check to
see if there were in uses of task->nsproxy_pid_ns I was not familiar
with, but it is only used when allocating a new pid for a new task,
and in checks to prevent craziness from happening.
Acked-by: Serge Hallyn <serge.hallyn@canonical.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 66635c8..eb45f1d 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1818,11 +1818,6 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags) if (unshare_flags & CLONE_NEWUSER) unshare_flags |= CLONE_THREAD | CLONE_FS; /* - * If unsharing a pid namespace must also unshare the thread. - */ - if (unshare_flags & CLONE_NEWPID) - unshare_flags |= CLONE_THREAD; - /* * If unsharing a thread from a thread group, must also unshare vm. */ if (unshare_flags & CLONE_THREAD) |
