Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6cea535 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-3.16-20140521' of git://gitorious.org/linux-can/linux-can-next 



Marc Kleine-Budde says:

====================
pull-request: can-next 2014-05-19

this is a pull request of a single patch for net-next/master. It fixes a
use after free(), which slipped into to gs_usb driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b1282726 cf68f517

drivers/net/can/usb/gs_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -826,8 +826,8 @@ static void gs_destroy_candev(struct gs_can *dev) 
{

	unregister_candev(dev->netdev);

	free_candev(dev->netdev);

	kfree(dev);

	usb_kill_anchored_urbs(&dev->tx_submitted);

	kfree(dev);

}



static int gs_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)