]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
can: kvaser_usb: kvaser_usb_read_bulk_callback(): fix URB memory leak
authorMarc Kleine-Budde <mkl@pengutronix.de>
Sat, 10 Jan 2026 11:52:27 +0000 (12:52 +0100)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Fri, 16 Jan 2026 19:40:40 +0000 (20:40 +0100)
Fix similar memory leak as in commit 7352e1d5932a ("can: gs_usb:
gs_usb_receive_bulk_callback(): fix URB memory leak").

In kvaser_usb_set_{,data_}bittiming() -> kvaser_usb_setup_rx_urbs(), the
URBs for USB-in transfers are allocated, added to the dev->rx_submitted
anchor and submitted. In the complete callback
kvaser_usb_read_bulk_callback(), the URBs are processed and resubmitted. In
kvaser_usb_remove_interfaces() the URBs are freed by calling
usb_kill_anchored_urbs(&dev->rx_submitted).

However, this does not take into account that the USB framework unanchors
the URB before the complete function is called. This means that once an
in-URB has been completed, it is no longer anchored and is ultimately not
released in usb_kill_anchored_urbs().

Fix the memory leak by anchoring the URB in the
kvaser_usb_read_bulk_callback() to the dev->rx_submitted anchor.

Fixes: 080f40a6fa28 ("can: kvaser_usb: Add support for Kvaser CAN/USB devices")
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260116-can_usb-fix-memory-leak-v2-3-4b8cb2915571@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c

index 62701ec34272ddca32711e8046117f3241c0cc87..d0a2a2a33c1c8472b1fcdbae570d49a18278f208 100644 (file)
@@ -361,7 +361,14 @@ resubmit_urb:
                          urb->transfer_buffer, KVASER_USB_RX_BUFFER_SIZE,
                          kvaser_usb_read_bulk_callback, dev);
 
+       usb_anchor_urb(urb, &dev->rx_submitted);
+
        err = usb_submit_urb(urb, GFP_ATOMIC);
+       if (!err)
+               return;
+
+       usb_unanchor_urb(urb);
+
        if (err == -ENODEV) {
                for (i = 0; i < dev->nchannels; i++) {
                        struct kvaser_usb_net_priv *priv;
@@ -372,7 +379,7 @@ resubmit_urb:
 
                        netif_device_detach(priv->netdev);
                }
-       } else if (err) {
+       } else {
                dev_err(&dev->intf->dev,
                        "Failed resubmitting read bulk urb: %d\n", err);
        }