[PATCH 1/1][CVE-2016-3951][Precise] usbnet: cleanup after bind() in probe()
Luis Henriques
luis.henriques at canonical.com
Mon May 30 13:54:06 UTC 2016
From: Oliver Neukum <oneukum at suse.com>
commit 1666984c8625b3db19a9abc298931d35ab7bc64b upstream.
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 at suse.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
CVE-2016-3951
BugLink: https://bugs.launchpad.net/bugs/156719
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
drivers/net/usb/usbnet.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 3d217421c016..8a6398bdd21a 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1486,6 +1486,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);
More information about the kernel-team
mailing list