diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-03-07 11:31:10 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-07 17:40:16 +0100 |
| commit | 1666984c8625b3db19a9abc298931d35ab7bc64b (patch) | |
| tree | 432871a9f48c74f45345621a49690ba809023dd1 /drivers | |
| parent | Merge branch 'mlxsw-fixes' (diff) | |
| download | linux-1666984c8625b3db19a9abc298931d35ab7bc64b.tar.xz linux-1666984c8625b3db19a9abc298931d35ab7bc64b.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/usb/usbnet.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 0b0ba7ef14e4..10798128c03f 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1769,6 +1769,13 @@ out3: 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; |