Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 867fd8d5 authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman
Browse files

ipv6: remove extra dev_hold() for fallback tunnels 



commit 0d7a7b2014b1a499a0fe24c9f3063d7856b5aaaf upstream.

My previous commits added a dev_hold() in tunnels ndo_init(),
but forgot to remove it from special functions setting up fallback tunnels.

Fallback tunnels do call their respective ndo_init()

This leads to various reports like :

unregister_netdevice: waiting for ip6gre0 to become free. Usage count = 2

Fixes: 48bb5697269a ("ip6_tunnel: sit: proper dev_{hold|put} in ndo_[un]init methods")
Fixes: 6289a98f0817 ("sit: proper dev_{hold|put} in ndo_[un]init methods")
Fixes: 40cb881b5aaa ("ip6_vti: proper dev_{hold|put} in ndo_[un]init methods")
Fixes: 7f700334be9a ("ip6_gre: proper dev_{hold|put} in ndo_[un]init methods")
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reported-by: default avatarsyzbot <syzkaller@googlegroups.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 873d5de7

net/ipv6/ip6_gre.c

+0 −3
Original line number Diff line number Diff line
@@ -392,7 +392,6 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net, 
	if (!(nt->parms.o_flags & TUNNEL_SEQ))

		dev->features |= NETIF_F_LLTX;



	dev_hold(dev);

	ip6gre_tunnel_link(ign, nt);

	return nt;
@@ -1546,8 +1545,6 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev) 
	strcpy(tunnel->parms.name, dev->name);



	tunnel->hlen		= sizeof(struct ipv6hdr) + 4;



	dev_hold(dev);

}



static struct inet6_protocol ip6gre_protocol __read_mostly = {

net/ipv6/ip6_tunnel.c

+0 −1
Original line number Diff line number Diff line
@@ -1909,7 +1909,6 @@ static int __net_init ip6_fb_tnl_dev_init(struct net_device *dev) 
	struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id);



	t->parms.proto = IPPROTO_IPV6;

	dev_hold(dev);



	rcu_assign_pointer(ip6n->tnls_wc[0], t);

	return 0;

net/ipv6/ip6_vti.c

+0 −1
Original line number Diff line number Diff line
@@ -956,7 +956,6 @@ static int __net_init vti6_fb_tnl_dev_init(struct net_device *dev) 
	struct vti6_net *ip6n = net_generic(net, vti6_net_id);



	t->parms.proto = IPPROTO_IPV6;

	dev_hold(dev);



	rcu_assign_pointer(ip6n->tnls_wc[0], t);

	return 0;

net/ipv6/sit.c

+0 −1
Original line number Diff line number Diff line
@@ -1421,7 +1421,6 @@ static void __net_init ipip6_fb_tunnel_init(struct net_device *dev) 
	iph->ihl		= 5;

	iph->ttl		= 64;



	dev_hold(dev);

	rcu_assign_pointer(sitn->tunnels_wc[0], tunnel);

}