| Message ID | 1497493770-13000-2-git-send-email-yanhaishuang@cmss.chinamobile.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Date: Thu, 15 Jun 2017 10:29:30 +0800 > When __ip6_tnl_rcv fails, the tun_dst won't be freed, so call > dst_release to free it in error code path. > > Fixes: 8d79266bc48c ("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> Applied.
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 9b37f97..ef99d59 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -859,6 +859,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; }
When __ip6_tnl_rcv fails, the tun_dst won't be freed, so call dst_release to free it in error code path. Fixes: 8d79266bc48c ("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> --- Changes since v4: * Add the the missing Fixes information * Free tun_dst from error code path * Add tester information --- net/ipv6/ip6_tunnel.c | 2 ++ 1 file changed, 2 insertions(+)