]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ipv6: release dst properly in ipip6_tunnel_xmit
authorLi RongQing <roy.qing.li@gmail.com>
Fri, 20 Dec 2013 09:20:12 +0000 (17:20 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 27 Dec 2013 18:14:40 +0000 (13:14 -0500)
if a dst is not attached to anywhere, it should be released before
exit ipip6_tunnel_xmit, otherwise cause dst memory leakage.

Fixes: 61c1db7fae21 ("ipv6: sit: add GSO/TSO support")
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/sit.c

index a710fdec42d3845920a6b9bf11116dc190fdd7fb..c87482252577c09e88b419e7f80a1d3eb2790226 100644 (file)
@@ -966,8 +966,10 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
        tos = INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6));
 
        skb = iptunnel_handle_offloads(skb, false, SKB_GSO_SIT);
-       if (IS_ERR(skb))
+       if (IS_ERR(skb)) {
+               ip_rt_put(rt);
                goto out;
+       }
 
        err = iptunnel_xmit(rt, skb, fl4.saddr, fl4.daddr, IPPROTO_IPV6, tos,
                            ttl, df, !net_eq(tunnel->net, dev_net(dev)));