diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-03-07 11:31:10 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-04-18 17:10:59 +0200 |
| commit | 1f001b6a11b79a0518db5121abb0699b2d09ed6c (patch) | |
| tree | e33c3b059949abb2ecb252e07a8d66061c06d8a3 | |
| parent | 88a61dbb3b73acb7dcd5317bd5c8283077f55cbb (diff) | |
| download | lwn-1f001b6a11b79a0518db5121abb0699b2d09ed6c.tar.gz lwn-1f001b6a11b79a0518db5121abb0699b2d09ed6c.zip | |
usbnet: cleanup after bind() in probe()
[ Upstream commit 1666984c8625b3db19a9abc298931d35ab7bc64b ]
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 3b7b7b2eba1b..4abd4579ba0c 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1719,6 +1719,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; |