Commit 092a29a4 authored Apr 02, 2015 by Yao Xiwei Committed by Steffen Klassert Apr 07, 2015

vti6: fix uninit when using x-netns



When the kernel deleted a vti6 interface, this interface was not removed from
the tunnels list. Thus, when the ip6_vti module was removed, this old interface
was found and the kernel tried to delete it again. This was leading to a kernel
panic.

Fixes: 61220ab3 ("vti6: Enable namespace changing")
Signed-off-by: Yao Xiwei <xiwei.yao@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent 68c11e98

net/ipv6/ip6_vti.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -288,8 +288,7 @@ static struct ip6_tnl vti6_locate(struct net net, struct __ip6_tnl_parm *p,
		static void vti6_dev_uninit(struct net_device *dev)
		{
		struct ip6_tnl *t = netdev_priv(dev);
		struct net *net = dev_net(dev);
		struct vti6_net *ip6n = net_generic(net, vti6_net_id);
		struct vti6_net *ip6n = net_generic(t->net, vti6_net_id);

		if (dev == ip6n->fb_tnl_dev)
		RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL);

Admin message