diff options
| author | Chris Mason <chris.mason@fusionio.com> | 2013-09-21 18:44:55 +0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@fusionio.com> | 2013-09-21 18:44:55 +0400 |
| commit | 07f0e62e7f2533918f28e780ab3cfeea1a63145d (patch) | |
| tree | cb64b7cf275f1a5fd7f121f4f434e77dc6769e37 /kernel/fork.c | |
| parent | d7396f07358a7c6e22c238d36d1d85f9d652a414 (diff) | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
| download | linux-07f0e62e7f2533918f28e780ab3cfeea1a63145d.tar.xz | |
Merge tag 'v3.11' into for-linus
Linux 3.11
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index e23bb19e2a3e..bf46287c91a4 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1177,7 +1177,8 @@ static struct task_struct *copy_process(unsigned long clone_flags, * don't allow the creation of threads. */ if ((clone_flags & (CLONE_VM|CLONE_NEWPID)) && - (task_active_pid_ns(current) != current->nsproxy->pid_ns)) + (task_active_pid_ns(current) != + current->nsproxy->pid_ns_for_children)) return ERR_PTR(-EINVAL); retval = security_task_create(clone_flags); @@ -1351,7 +1352,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, if (pid != &init_struct_pid) { retval = -ENOMEM; - pid = alloc_pid(p->nsproxy->pid_ns); + pid = alloc_pid(p->nsproxy->pid_ns_for_children); if (!pid) goto bad_fork_cleanup_io; } |