]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
sit: proper dev_{hold|put} in ndo_[un]init methods
authorEric Dumazet <edumazet@google.com>
Mon, 29 Mar 2021 19:25:22 +0000 (12:25 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 22 May 2021 08:38:30 +0000 (10:38 +0200)
commit 6289a98f0817a4a457750d6345e754838eae9439 upstream.

After adopting CONFIG_PCPU_DEV_REFCNT=n option, syzbot was able to trigger
a warning [1]

Issue here is that:

- all dev_put() should be paired with a corresponding prior dev_hold().

- A driver doing a dev_put() in its ndo_uninit() MUST also
  do a dev_hold() in its ndo_init(), only when ndo_init()
  is returning 0.

Otherwise, register_netdevice() would call ndo_uninit()
in its error path and release a refcount too soon.

Fixes: 919067cc845f ("net: add CONFIG_PCPU_DEV_REFCNT")
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>
net/ipv6/sit.c

index 1ee190137da4024d1f7501d5393cae1b86fb7e6b..b1913993b321093a6e9ffb4802e882a9fa3b309c 100644 (file)
@@ -209,8 +209,6 @@ static int ipip6_tunnel_create(struct net_device *dev)
 
        dev->rtnl_link_ops = &sit_link_ops;
 
-       dev_hold(dev);
-
        ipip6_tunnel_link(sitn, t);
        return 0;
 
@@ -1399,7 +1397,7 @@ static int ipip6_tunnel_init(struct net_device *dev)
                dev->tstats = NULL;
                return err;
        }
-
+       dev_hold(dev);
        return 0;
 }