Commit 17c09e33 authored Mar 07, 2016 by Oliver Neukum Committed by Sasha Levin Jul 12, 2016

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: Sasha Levin <sasha.levin@oracle.com>

parent cb7669cf

drivers/net/usb/usbnet.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -1755,6 +1755,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;