Skip to content

Commit

Permalink
sit: proper dev_{hold|put} in ndo_[un]init methods
Browse files Browse the repository at this point in the history
BugLink: https://bugs.launchpad.net/bugs/1933969

commit 6289a98 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: 919067c ("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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
  • Loading branch information
Eric Dumazet authored and Stefan Bader committed Jun 29, 2021
1 parent 8efc9f9 commit 9fff2d8
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions net/ipv6/sit.c
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,6 @@ static int ipip6_tunnel_create(struct net_device *dev)

ipip6_tunnel_clone_6rd(dev, sitn);

dev_hold(dev);

ipip6_tunnel_link(sitn, t);
return 0;

Expand Down Expand Up @@ -1456,7 +1454,7 @@ static int ipip6_tunnel_init(struct net_device *dev)
dev->tstats = NULL;
return err;
}

dev_hold(dev);
return 0;
}

Expand Down

0 comments on commit 9fff2d8

Please sign in to comment.