lkml.org 
[lkml]   [2012]   [Sep]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 007/262] pptp: lookup route with the proper net namespace
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.5-stable review patch. If anyone has any objections, please let me know.

    ------------------


    From: Gao feng <gaofeng@cn.fujitsu.com>

    [ Upstream commit 08252b32311c3fa84219ad794d640af7399b5485 ]

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ppp/pptp.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/ppp/pptp.c
    +++ b/drivers/net/ppp/pptp.c
    @@ -189,7 +189,7 @@ static int pptp_xmit(struct ppp_channel
    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 *s
    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,



    \
     
     \ /
      Last update: 2012-09-29 02:21    [W:2.887 / U:0.804 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site