aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-10-26 22:56:12 -0700
committerDavid S. Miller <davem@davemloft.net>2007-10-26 22:56:12 -0700
commitceaa79c434044e40031585a65a4e45dc09322e8f (patch)
treeb18dc0cdbebe096bf2a07149b6904b8b55d0502d
parent[NET]: Marking struct pernet_operations __net_initdata was inappropriate (diff)
downloadlinux-dev-ceaa79c434044e40031585a65a4e45dc09322e8f.tar.xz
linux-dev-ceaa79c434044e40031585a65a4e45dc09322e8f.zip
[NETNS]: Fix get_net_ns_by_pid
The pid namespace patches changed the semantics of find_task_by_pid without breaking the compile resulting in get_net_ns_by_pid doing the wrong thing. So switch to using the intended find_task_by_vpid. Combined with Denis' earlier patch to make netlink traffic fully synchronous the inadvertent race I introduced with accessing current is actually removed. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/rtnetlink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 4a2640d38261..e1ba26fb4bf2 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -742,7 +742,7 @@ static struct net *get_net_ns_by_pid(pid_t pid)
/* Lookup the network namespace */
net = ERR_PTR(-ESRCH);
rcu_read_lock();
- tsk = find_task_by_pid(pid);
+ tsk = find_task_by_vpid(pid);
if (tsk) {
struct nsproxy *nsproxy;
nsproxy = task_nsproxy(tsk);