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

Commit f61c4d3a authored by Stephane Grosjean's avatar Stephane Grosjean Committed by Greg Kroah-Hartman
Browse files

can: peak_usb: fix potential double kfree_skb() 



commit fee6a8923ae0d318a7f7950c6c6c28a96cea099b upstream.

When closing the CAN device while tx skbs are inflight, echo skb could
be released twice. By calling close_candev() before unlinking all
pending tx urbs, then the internal echo_skb[] array is fully and
correctly cleared before the USB write callback and, therefore,
can_get_echo_skb() are called, for each aborted URB.

Fixes: bb478555 ("can: usb: PEAK-System Technik USB adapters driver core")
Signed-off-by: default avatarStephane Grosjean <s.grosjean@peak-system.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e9038a2

drivers/net/can/usb/peak_usb/pcan_usb_core.c

+4 −4
Original line number Diff line number Diff line
@@ -576,16 +576,16 @@ static int peak_usb_ndo_stop(struct net_device *netdev) 
	dev->state &= ~PCAN_USB_STATE_STARTED;

	netif_stop_queue(netdev);



	close_candev(netdev);



	dev->can.state = CAN_STATE_STOPPED;



	/* unlink all pending urbs and free used memory */

	peak_usb_unlink_all_urbs(dev);



	if (dev->adapter->dev_stop)

		dev->adapter->dev_stop(dev);



	close_candev(netdev);



	dev->can.state = CAN_STATE_STOPPED;



	/* can set bus off now */

	if (dev->adapter->dev_set_bus) {

		int err = dev->adapter->dev_set_bus(dev, 0);