[PATCH v2 1/2] ip_tunnel: fix ip tunnel lookup in collect_md mode

Path	csiph.com!news.redatomik.org!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Newsgroups	linux.kernel
Subject	[PATCH v2 1/2] ip_tunnel: fix ip tunnel lookup in collect_md mode
Date	Sat, 17 Jun 2017 05:30:01 +0200
Message-ID	<tTcAV-18w-5@gated-at.bofh.it> (permalink)
X-Rm-Transid	2ee55944a198532-08564
X-Rm-Spam-Flag	00000000
X-Rm-Transid	2ee55944a1978fe-1b14e
X-Mailer	git-send-email 1.8.3.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	30
Organization	linux.* mail to news gateway
X-Original-Cc	netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Haishuang Yan <yanhaishuang@cmss.chinamobile.com>, Pravin B Shelar <pshelar@nicira.com>
X-Original-Date	Sat, 17 Jun 2017 11:27:10 +0800
X-Original-Message-ID	<1497670031-2971-1-git-send-email-yanhaishuang@cmss.chinamobile.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1668149

Show key headers only | View raw

In collect_md mode, if the tun dev is down, it still can call
ip_tunnel_rcv to receive on packets, and the rx statistics increase
improperly.

Fixes: 2e15ea390e6f ("ip_gre: Add support to collect tunnel metadata.")
Cc: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>

---
Change since v2:
  * Fix wrong recipient addresss
---
 net/ipv4/ip_tunnel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index 0f1d876..a3caba1 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -176,7 +176,7 @@ struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,
 		return cand;
 
 	t = rcu_dereference(itn->collect_md_tun);
-	if (t)
+	if (t && (t->dev->flags & IFF_UP))
 		return t;
 
 	if (itn->fb_tunnel_dev && itn->fb_tunnel_dev->flags & IFF_UP)
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 1/2] ip_tunnel: fix ip tunnel lookup in collect_md mode Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-06-17 05:30 +0200
  [PATCH v2 2/2] ip6_tunnel: fix ip6 tunnel lookup in collect_md mode Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-06-17 05:30 +0200
  Re: [PATCH v2 1/2] ip_tunnel: fix ip tunnel lookup in collect_md mode Pravin Shelar <pshelar@ovn.org> - 2017-06-19 07:50 +0200
    Re: [PATCH v2 1/2] ip_tunnel: fix ip tunnel lookup in collect_md mode 严海双 <yanhaishuang@cmss.chinamobile.com> - 2017-06-19 15:20 +0200
      Re: [PATCH v2 1/2] ip_tunnel: fix ip tunnel lookup in collect_md mode Pravin Shelar <pshelar@ovn.org> - 2017-06-19 20:10 +0200

csiph-web