diff options
| author | Stephane Grosjean | 2019-07-05 15:32:16 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde | 2019-07-24 11:16:31 +0200 |
| commit | fee6a8923ae0d318a7f7950c6c6c28a96cea099b (patch) | |
| tree | 71cb3eb30d31075dc22ccc2192415afa4aab6344 /drivers/net/can | |
| parent | can: flexcan: fix stop mode acknowledgment (diff) | |
| download | kernel-qcow2-linux-fee6a8923ae0d318a7f7950c6c6c28a96cea099b.tar.gz kernel-qcow2-linux-fee6a8923ae0d318a7f7950c6c6c28a96cea099b.tar.xz kernel-qcow2-linux-fee6a8923ae0d318a7f7950c6c6c28a96cea099b.zip | |
can: peak_usb: fix potential double kfree_skb()
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: bb4785551f64 ("can: usb: PEAK-System Technik USB adapters driver core")
Signed-off-by: Stephane Grosjean <s.grosjean@peak-system.com>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/usb/peak_usb/pcan_usb_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c index 458154c9b482..22b9c8e6d040 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c @@ -568,16 +568,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); |