Skip to content

Commit

Permalink
ip6_tunnel: fix ip6 tunnel lookup in collect_md mode
Browse files Browse the repository at this point in the history
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.

When the md tunnel is down, it's not neccessary to increase RX drops
for the tunnel device, packets would be recieved on fallback tunnel,
and the RX drops on fallback device will be increased as expected.

Fixes: 8d79266 ("ip6_tunnel: add collect_md mode to IPv6 tunnels")
Cc: Alexei Starovoitov <ast@fb.com>
Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Haishuang Yan authored and David S. Miller committed Sep 13, 2017
1 parent 833a8b4 commit 6c1cb43
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/ipv6/ip6_tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ ip6_tnl_lookup(struct net *net, const struct in6_addr *remote, const struct in6_
}

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]);
Expand Down

0 comments on commit 6c1cb43

Please sign in to comment.