]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ip6_tunnel: fix potential issue in __ip6_tnl_rcv
authorHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Thu, 15 Jun 2017 02:29:30 +0000 (10:29 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Jun 2017 16:01:29 +0000 (12:01 -0400)
When __ip6_tnl_rcv fails, the tun_dst won't be freed, so call
dst_release to free it in error code path.

Fixes: 0b8b3a8de6df ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
CC: Alexei Starovoitov <ast@fb.com>
Tested-by: Zhang Shengju <zhangshengju@cmss.chinamobile.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_tunnel.c

index c3581973f5d7265a574ae69416a516526ed64e44..035c0496b92a14a8a269510e765b1e256cfef872 100644 (file)
@@ -858,6 +858,8 @@ static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb,
        return 0;
 
 drop:
+       if (tun_dst)
+               dst_release((struct dst_entry *)tun_dst);
        kfree_skb(skb);
        return 0;
 }