diff options
author | Haishuang Yan <yanhaishuang@cmss.chinamobile.com> | 2017-06-14 22:29:29 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-16 12:01:29 -0400 |
commit | 469f87e158628fe66dcbbce9dd5e7b7acfe934a9 (patch) | |
tree | a3b7388431138984c5d6a9d8fa2f242bf8e853f7 | |
parent | be56a099e0f990532e10c940a3778303cc5a0d91 (diff) |
ip_tunnel: fix potential issue in ip_tunnel_rcv
When ip_tunnel_rcv fails, the tun_dst won't be freed, so call
dst_release to free it in error code path.
Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
Acked-by: Eric Dumazet <edumazet@google.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
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>
-rw-r--r-- | net/ipv4/ip_tunnel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index b436d0775631..129d1a3616f8 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c | |||
@@ -446,6 +446,8 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, | |||
446 | return 0; | 446 | return 0; |
447 | 447 | ||
448 | drop: | 448 | drop: |
449 | if (tun_dst) | ||
450 | dst_release((struct dst_entry *)tun_dst); | ||
449 | kfree_skb(skb); | 451 | kfree_skb(skb); |
450 | return 0; | 452 | return 0; |
451 | } | 453 | } |