lkml.org 
[lkml]   [2019]   [Aug]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 152/157] ipv4: ip_tunnel: use net namespace from rtable not socket
    3.16.72-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Hannes Frederic Sowa <hannes@stressinduktion.org>

    commit 926a882f6916fd76b6f8ee858d45a2241c5e7999 upstream.

    The socket parameter might legally be NULL, thus sock_net is sometimes
    causing a NULL pointer dereference. Using net_device pointer in dst_entry
    is more reliable.

    Fixes: b6a7719aedd7e5c ("ipv4: hash net ptr into fragmentation bucket selection")
    Reported-by: Rick Jones <rick.jones2@hp.com>
    Cc: Rick Jones <rick.jones2@hp.com>
    Cc: David S. Miller <davem@davemloft.net>
    Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    net/ipv4/ip_tunnel_core.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/net/ipv4/ip_tunnel_core.c
    +++ b/net/ipv4/ip_tunnel_core.c
    @@ -74,7 +74,8 @@ int iptunnel_xmit(struct sock *sk, struc
    iph->daddr = dst;
    iph->saddr = src;
    iph->ttl = ttl;
    - __ip_select_ident(sock_net(sk), iph, skb_shinfo(skb)->gso_segs ?: 1);
    + __ip_select_ident(dev_net(rt->dst.dev), iph,
    + skb_shinfo(skb)->gso_segs ?: 1);

    err = ip_local_out_sk(sk, skb);
    if (unlikely(net_xmit_eval(err)))
    \
     
     \ /
      Last update: 2019-08-10 22:50    [W:5.029 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site