[PATCH 2/2] ip6_tunnel: fix ip6 tunnel lookup in collect_md mode

From	Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Newsgroups	linux.kernel
Subject	[PATCH 2/2] ip6_tunnel: fix ip6 tunnel lookup in collect_md mode
Date	2017-06-15 18:40 +0200
Message-ID	<tSFYn-4Nd-77@gated-at.bofh.it> (permalink)
References	<tSFYn-4Nd-67@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Fixes: 8d79266bc48c ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
Cc: Alexei Starovoitov <ast@fb.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
---
 net/ipv6/ip6_tunnel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 6400726..25961c7 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -171,7 +171,7 @@ static struct net_device_stats *ip6_get_stats(struct net_device *dev)
 	}
 
 	t = rcu_dereference(ip6n->collect_md_tun);
-	if (t)
+	if (t && (t->dev->flags & IFF_UP))
 		return t;
 
 	t = rcu_dereference(ip6n->tnls_wc[0]);
-- 
1.8.3.1

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

Thread

[PATCH 1/2] ip_tunnel: fix ip tunnel lookup in collect_md mode Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-06-15 18:40 +0200
  [PATCH 2/2] ip6_tunnel: fix ip6 tunnel lookup in collect_md mode Haishuang Yan <yanhaishuang@cmss.chinamobile.com> - 2017-06-15 18:40 +0200

csiph-web