[PATCH] usbnet: cleanup after bind() in probe()

[PATCH] usbnet: cleanup after bind() in probe()

[Oliver Neukum]

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-IBi9RG/b67k@public.gmane.org>
---
 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 0b0ba7e..1079812 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;
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] usbnet: cleanup after bind() in probe()

[David Miller]

From: Oliver Neukum <oneukum@suse.com>
Date: Mon,  7 Mar 2016 11:31:10 +0100

> 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>

Applied, thanks Oliver.

How far back does this bug exist?  I'm trying to figure out what
-stable branchs to send it to.

Thanks.

Re: [PATCH] usbnet: cleanup after bind() in probe()

[Oliver Neukum]

On Mon, 2016-03-07 at 11:41 -0500, David Miller wrote:
> From: Oliver Neukum <oneukum-IBi9RG/b67k@public.gmane.org>
> Date: Mon,  7 Mar 2016 11:31:10 +0100
> 
> > 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-IBi9RG/b67k@public.gmane.org>
> 
> Applied, thanks Oliver.
> 
> How far back does this bug exist?  I'm trying to figure out what
> -stable branchs to send it to.

It goes back to 3.12

	HTH
		Oliver



--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html