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: Eric Dumazet <edumazet@google.com>
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
index 6efe6b101d3f70e022db0a80db247c4c5468a7a0..23e6a845c7fa942d2d4215d43ceeabd5900e4174 100644 (file)
--- a/net/ipv6/ip6_gre.c
+++ b/net/ipv6/ip6_gre.c
@@ -350,7 +350,6 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net,
        if (!(nt->parms.o_flags & GRE_SEQ))
                dev->features |= NETIF_F_LLTX;
 
-       dev_hold(dev);
        ip6gre_tunnel_link(ign, nt);
        return nt;
 
@@ -1310,8 +1309,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);
 }
 
 

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index 478baeb08951fcab9a9195a7b103b981f9ff9ceb..80f88df280d7ad0a1debad5d35b62bc7e26610fd 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1614,7 +1614,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;

diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
index 3e917e358459645fbdb2d7fb98cc98558cdf9159..1ff29eba7df76ad6612ad4ad36a3b36ef6bb2c9b 100644 (file)
--- a/net/ipv6/ip6_vti.c
+++ b/net/ipv6/ip6_vti.c
@@ -931,7 +931,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;

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index b1913993b321093a6e9ffb4802e882a9fa3b309c..6a5442fdbd5166a49e22d5095cf8714994b113a4 100644 (file)
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -1413,7 +1413,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);
 }