summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhuaibin Wang <huaibin.wang@6wind.com>2015-08-25 16:20:34 +0200
committerLuis Henriques <luis.henriques@canonical.com>2015-09-03 13:30:00 +0100
commit36d6dfffc0b860a9ade17c96b3af5cd49108c498 (patch)
treea14f86e6316acafa777c950a0c993cabf420cbeb
parent8a88f912faa9b3bbf468c87f84df3ec4fb648456 (diff)
downloadlinux-stable-36d6dfffc0b860a9ade17c96b3af5cd49108c498.tar.gz
linux-stable-36d6dfffc0b860a9ade17c96b3af5cd49108c498.tar.bz2
linux-stable-36d6dfffc0b860a9ade17c96b3af5cd49108c498.zip
ip6_gre: release cached dst on tunnel removal
commit d4257295ba1b389c693b79de857a96e4b7cd8ac0 upstream. When a tunnel is deleted, the cached dst entry should be released. This problem may prevent the removal of a netns (seen with a x-netns IPv6 gre tunnel): unregister_netdevice: waiting for lo to become free. Usage count = 3 CC: Dmitry Kozlov <xeb@mail.ru> Fixes: c12b395a4664 ("gre: Support GRE over IPv6") Signed-off-by: huaibin Wang <huaibin.wang@6wind.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
-rw-r--r--net/ipv6/ip6_gre.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 07506e7a8917..f5ea5aaf75f9 100644
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -358,6 +358,7 @@ static void ip6gre_tunnel_uninit(struct net_device *dev)
struct ip6gre_net *ign = net_generic(t->net, ip6gre_net_id);
ip6gre_tunnel_unlink(ign, t);
+ ip6_tnl_dst_reset(t);
dev_put(dev);
}