]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
can: mcba_usb: mcba_usb_start_xmit(): fix double dev_kfree_skb in error path
authorHangyu Hua <hbh25y@gmail.com>
Fri, 11 Mar 2022 08:02:08 +0000 (16:02 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 13:19:33 +0000 (15:19 +0200)
BugLink: https://bugs.launchpad.net/bugs/1971497
commit 04c9b00ba83594a29813d6b1fb8fdc93a3915174 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: 51f3baad7de9 ("can: mcba_usb: Add support for Microchip CAN BUS Analyzer")
Link: https://lore.kernel.org/all/20220311080208.45047-1-hbh25y@gmail.com
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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/net/can/usb/mcba_usb.c

index 41eee6f0491c67d222a211d16df87df598e95331..d6a23f36a2772f0430e86dd8a0df3ddfb1c8d722 100644 (file)
@@ -368,7 +368,6 @@ static netdev_tx_t mcba_usb_start_xmit(struct sk_buff *skb,
 xmit_failed:
        can_free_echo_skb(priv->netdev, ctx->ndx);
        mcba_usb_free_ctx(ctx);
-       dev_kfree_skb(skb);
        stats->tx_dropped++;
 
        return NETDEV_TX_OK;