diff options
author | Tom Goff <thomas.goff@boeing.com> | 2010-03-19 15:38:50 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-03-26 20:13:58 -0700 |
commit | 66aa4a55fe0548c8b13a195c61774db65c5896cd (patch) | |
tree | d689361c310ae55678f9fbd73b8d2d273f830ecc /net/netlink | |
parent | 5c58c47a4f3758c81594402451d8fe0d8accb4e8 (diff) | |
download | linux-3.10-66aa4a55fe0548c8b13a195c61774db65c5896cd.tar.gz linux-3.10-66aa4a55fe0548c8b13a195c61774db65c5896cd.tar.bz2 linux-3.10-66aa4a55fe0548c8b13a195c61774db65c5896cd.zip |
netlink: use the appropriate namespace pid
This was included in OpenVZ kernels but wasn't integrated upstream.
>From git://git.openvz.org/pub/linux-2.6.24-openvz:
commit 5c69402f18adf7276352e051ece2cf31feefab02
Author: Alexey Dobriyan <adobriyan@openvz.org>
Date: Mon Dec 24 14:37:45 2007 +0300
netlink: fixup ->tgid to work in multiple PID namespaces
Signed-off-by: Tom Goff <thomas.goff@boeing.com>
Acked-by: Alexey Dobriyan <adobriyan@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
-rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index acbbae1e89b..274d977166b 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -545,7 +545,7 @@ static int netlink_autobind(struct socket *sock) struct hlist_head *head; struct sock *osk; struct hlist_node *node; - s32 pid = current->tgid; + s32 pid = task_tgid_vnr(current); int err; static s32 rover = -4097; |