diff options
| author | Andy Lutomirski <luto@amacapital.net> | 2013-08-22 20:39:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-27 19:52:52 +0200 |
| commit | c2b1df2eb42978073ec27c99cc199d20ae48b849 (patch) | |
| tree | 5b7335ad7fc7e17a26a2e724c7f1f93970bc75fc /kernel/pid_namespace.c | |
| parent | net: Check the correct namespace when spoofing pid over SCM_RIGHTS (diff) | |
| download | linux-c2b1df2eb42978073ec27c99cc199d20ae48b849.tar.xz linux-c2b1df2eb42978073ec27c99cc199d20ae48b849.zip | |
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/pid_namespace.c')
| -rw-r--r-- | kernel/pid_namespace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c index 6917e8edb48e..601bb361c235 100644 --- a/kernel/pid_namespace.c +++ b/kernel/pid_namespace.c @@ -349,8 +349,8 @@ static int pidns_install(struct nsproxy *nsproxy, void *ns) if (ancestor != active) return -EINVAL; - put_pid_ns(nsproxy->pid_ns); - nsproxy->pid_ns = get_pid_ns(new); + put_pid_ns(nsproxy->pid_ns_for_children); + nsproxy->pid_ns_for_children = get_pid_ns(new); return 0; } |