lkml.org 
[lkml]   [2017]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 2/2] ip6_tunnel: fix ip6 tunnel lookup in collect_md mode
Date
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>

---
Change since v3:
* Increment rx_dropped if tunnel device is not up, suggested by
Pravin B Shelar
* Fix wrong recipient address
---
net/ipv6/ip6_tunnel.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 10a693a..e91d3b6 100644
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -171,8 +171,11 @@ static struct net_device_stats *ip6_get_stats(struct net_device *dev)
}

t = rcu_dereference(ip6n->collect_md_tun);
- if (t)
- return t;
+ if (t) {
+ if (t->dev->flags & IFF_UP)
+ return t;
+ t->dev->stats.rx_dropped++;
+ }

t = rcu_dereference(ip6n->tnls_wc[0]);
if (t && (t->dev->flags & IFF_UP))
--
1.8.3.1


\
 
 \ /
  Last update: 2017-09-04 10:37    [W:0.045 / U:2.064 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site