diff options
| author | Oliver Neukum <oneukum@suse.com> | 2016-03-07 11:31:10 +0100 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-05-06 22:35:00 +1000 |
| commit | 02ce1dffb72e5f2edd51d556acb7a38ceb44ab4a (patch) | |
| tree | 6b9d45beb4cc03f026a7ba4d2707040d00d6c45e /drivers/net | |
| parent | fc6dcc59053f65282c7945499349bdbd154e5409 (diff) | |
| download | kernel_samsung_smdk4412-02ce1dffb72e5f2edd51d556acb7a38ceb44ab4a.zip kernel_samsung_smdk4412-02ce1dffb72e5f2edd51d556acb7a38ceb44ab4a.tar.gz kernel_samsung_smdk4412-02ce1dffb72e5f2edd51d556acb7a38ceb44ab4a.tar.bz2 | |
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.
Change-Id: I43b1673bc31b3af05789e461b39c55062735cc56
Signed-off-by: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -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 bc2e489..460979d 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1523,6 +1523,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: usb_put_dev(xdev); |