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

Message ID 1497670031-2971-2-git-send-email-yanhaishuang@cmss.chinamobile.com
State Changes Requested
Delegated to: David Miller
Headers show

Commit Message

Haishuang Yan June 17, 2017, 3:27 a.m.
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

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>

Change since v2:
  * Fix wrong recipient address
 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]);