diff options
| author | Gao feng <gaofeng@cn.fujitsu.com> | 2012-08-07 02:23:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-09 00:57:10 +0200 |
| commit | 08252b32311c3fa84219ad794d640af7399b5485 (patch) | |
| tree | 2198ed2425cdcdcd7d69a5c32f3de87419c26c1d /drivers/net/ppp/pptp.c | |
| parent | Merge branch 'fixes-for-3.6' of git://gitorious.org/linux-can/linux-can (diff) | |
| download | linux-08252b32311c3fa84219ad794d640af7399b5485.tar.xz linux-08252b32311c3fa84219ad794d640af7399b5485.zip | |
pptp: lookup route with the proper net namespace
pptp always use init_net as the net namespace to lookup
route, this will cause route lookup failed in container.
because we already set the correct net namespace to struct
sock in pptp_create,so fix this by using sock_net(sk) to
replace &init_net.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ppp/pptp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ppp/pptp.c b/drivers/net/ppp/pptp.c index 1c98321b56cc..162464fe86bf 100644 --- a/drivers/net/ppp/pptp.c +++ b/drivers/net/ppp/pptp.c @@ -189,7 +189,7 @@ static int pptp_xmit(struct ppp_channel *chan, struct sk_buff *skb) if (sk_pppox(po)->sk_state & PPPOX_DEAD) goto tx_error; - rt = ip_route_output_ports(&init_net, &fl4, NULL, + rt = ip_route_output_ports(sock_net(sk), &fl4, NULL, opt->dst_addr.sin_addr.s_addr, opt->src_addr.sin_addr.s_addr, 0, 0, IPPROTO_GRE, @@ -468,7 +468,7 @@ static int pptp_connect(struct socket *sock, struct sockaddr *uservaddr, po->chan.private = sk; po->chan.ops = &pptp_chan_ops; - rt = ip_route_output_ports(&init_net, &fl4, sk, + rt = ip_route_output_ports(sock_net(sk), &fl4, sk, opt->dst_addr.sin_addr.s_addr, opt->src_addr.sin_addr.s_addr, 0, 0, |