Skip to content

Commit 5318cdf

Browse files
HBh25Ygregkh
authored andcommitted
can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
commit 3d3925f upstream. There is no need to call dev_kfree_skb() when usb_submit_urb() fails because can_put_echo_skb() deletes original skb and can_free_echo_skb() deletes the cloned skb. Fixes: 0024d8a ("can: usb_8dev: Add support for USB2CAN interface from 8 devices") Link: https://lore.kernel.org/all/20220311080614.45229-1-hbh25y@gmail.com Cc: stable@vger.kernel.org Signed-off-by: Hangyu Hua <hbh25y@gmail.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 869016a commit 5318cdf

1 file changed

Lines changed: 14 additions & 16 deletions

File tree

drivers/net/can/usb/usb_8dev.c

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -670,9 +670,20 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb,
670670
atomic_inc(&priv->active_tx_urbs);
671671

672672
err = usb_submit_urb(urb, GFP_ATOMIC);
673-
if (unlikely(err))
674-
goto failed;
675-
else if (atomic_read(&priv->active_tx_urbs) >= MAX_TX_URBS)
673+
if (unlikely(err)) {
674+
can_free_echo_skb(netdev, context->echo_index);
675+
676+
usb_unanchor_urb(urb);
677+
usb_free_coherent(priv->udev, size, buf, urb->transfer_dma);
678+
679+
atomic_dec(&priv->active_tx_urbs);
680+
681+
if (err == -ENODEV)
682+
netif_device_detach(netdev);
683+
else
684+
netdev_warn(netdev, "failed tx_urb %d\n", err);
685+
stats->tx_dropped++;
686+
} else if (atomic_read(&priv->active_tx_urbs) >= MAX_TX_URBS)
676687
/* Slow down tx path */
677688
netif_stop_queue(netdev);
678689

@@ -691,19 +702,6 @@ static netdev_tx_t usb_8dev_start_xmit(struct sk_buff *skb,
691702

692703
return NETDEV_TX_BUSY;
693704

694-
failed:
695-
can_free_echo_skb(netdev, context->echo_index);
696-
697-
usb_unanchor_urb(urb);
698-
usb_free_coherent(priv->udev, size, buf, urb->transfer_dma);
699-
700-
atomic_dec(&priv->active_tx_urbs);
701-
702-
if (err == -ENODEV)
703-
netif_device_detach(netdev);
704-
else
705-
netdev_warn(netdev, "failed tx_urb %d\n", err);
706-
707705
nomembuf:
708706
usb_free_urb(urb);
709707

0 commit comments

Comments
 (0)