diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2013-08-22 11:39:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-27 13:52:52 -0400 |
| commit | c2b1df2eb42978073ec27c99cc199d20ae48b849 (patch) | |
| tree | 5b7335ad7fc7e17a26a2e724c7f1f93970bc75fc /kernel/fork.c | |
| parent | d661684cf6820331feae71146c35da83d794467e (diff) | |
| download | op-kernel-dev-c2b1df2eb42978073ec27c99cc199d20ae48b849.zip op-kernel-dev-c2b1df2eb42978073ec27c99cc199d20ae48b849.tar.gz | |
Rename nsproxy.pid_ns to nsproxy.pid_ns_for_children
nsproxy.pid_ns is *not* the task's pid namespace. The name should clarify
that.
This makes it more obvious that setns on a pid namespace is weird --
it won't change the pid namespace shown in procfs.
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Reviewed-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 e23bb19..bf46287 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; } |
