Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1666394 > unrolled thread

[PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv

Started byHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
First post2017-06-15 04:40 +0200
Last post2017-06-16 18:10 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-06-15 04:40 +0200
    Re: [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv David Miller <davem@davemloft.net> - 2017-06-16 18:10 +0200

#1666394 — [PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv

FromHaishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date2017-06-15 04:40 +0200
Subject[PATCH v4 1/2] ip_tunnel: fix potential issue in ip_tunnel_rcv
Message-ID<tSsRr-52d-5@gated-at.bofh.it>
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>

---
Change since v4:
  * Add the the missing Fixes information
  * Free tun_dst from error code path
  * Add tester information
---
 net/ipv4/ip_tunnel.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index b878ecb..0f1d876 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,
 	return 0;
 
 drop:
+	if (tun_dst)
+		dst_release((struct dst_entry *)tun_dst);
 	kfree_skb(skb);
 	return 0;
 }
-- 
1.8.3.1

[toc] | [next] | [standalone]


#1667857

FromDavid Miller <davem@davemloft.net>
Date2017-06-16 18:10 +0200
Message-ID<tT1YS-2mF-19@gated-at.bofh.it>
In reply to#1666394
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Date: Thu, 15 Jun 2017 10:29:29 +0800

> 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>

Applied.

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web