ipv6: call iptunnel_xmit with NULL sock pointer if no tunnel sock is available
authorHannes Frederic Sowa <hannes@stressinduktion.org>
Wed, 8 Apr 2015 15:01:23 +0000 (17:01 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Apr 2015 16:09:43 +0000 (12:09 -0400)
Fixes: 79b16aadea32cce ("udp_tunnel: Pass UDP socket down through udp_tunnel{, 6}_xmit_skb().")
Reported-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/sit.c

index 6cf2026a9cea849c067d7388bc23f5d3a20cbeac..ac35a28599be557cac1114cad35e3c47c41436c1 100644 (file)
@@ -983,7 +983,7 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
 
        skb_set_inner_ipproto(skb, IPPROTO_IPV6);
 
-       err = iptunnel_xmit(skb->sk, rt, skb, fl4.saddr, fl4.daddr,
+       err = iptunnel_xmit(NULL, rt, skb, fl4.saddr, fl4.daddr,
                            protocol, tos, ttl, df,
                            !net_eq(tunnel->net, dev_net(dev)));
        iptunnel_xmit_stats(err, &dev->stats, dev->tstats);