mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
usbnet: cleanup after bind() in probe()
In case bind() works, but a later error forces bailing in probe() in error cases work and a timer may be scheduled. They must be killed. This fixes an error case related to the double free reported in http://www.spinics.net/lists/netdev/msg367669.html and needs to go on top of Linus' fix to cdc-ncm. Signed-off-by: Oliver Neukum <ONeukum@suse.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a383b7f0e0
commit
1666984c86
1 changed files with 7 additions and 0 deletions
|
@ -1769,6 +1769,13 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
|
|||
if (info->unbind)
|
||||
info->unbind (dev, udev);
|
||||
out1:
|
||||
/* subdrivers must undo all they did in bind() if they
|
||||
* fail it, but we may fail later and a deferred kevent
|
||||
* may trigger an error resubmitting itself and, worse,
|
||||
* schedule a timer. So we kill it all just in case.
|
||||
*/
|
||||
cancel_work_sync(&dev->kevent);
|
||||
del_timer_sync(&dev->delay);
|
||||
free_netdev(net);
|
||||
out:
|
||||
return status;
|
||||
|
|
Loading…
Reference in a new issue