Skip to content

Commit 710a752

Browse files
can: mcba_usb: mcba_usb_read_bulk_callback(): fix URB memory leak
Fix similar memory leak as in commit 7352e1d ("can: gs_usb: gs_usb_receive_bulk_callback(): fix URB memory leak"). In mcba_usb_probe() -> mcba_usb_start(), the URBs for USB-in transfers are allocated, added to the priv->rx_submitted anchor and submitted. In the complete callback mcba_usb_read_bulk_callback(), the URBs are processed and resubmitted. In mcba_usb_close() -> mcba_urb_unlink() the URBs are freed by calling usb_kill_anchored_urbs(&priv->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 mcba_usb_read_bulk_callback()to the priv->rx_submitted anchor. Fixes: 51f3baa ("can: mcba_usb: Add support for Microchip CAN BUS Analyzer") Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260116-can_usb-fix-memory-leak-v2-4-4b8cb2915571@pengutronix.de Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
1 parent 248e8e1 commit 710a752

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/net/can/usb/mcba_usb.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,11 +608,17 @@ static void mcba_usb_read_bulk_callback(struct urb *urb)
608608
urb->transfer_buffer, MCBA_USB_RX_BUFF_SIZE,
609609
mcba_usb_read_bulk_callback, priv);
610610

611+
usb_anchor_urb(urb, &priv->rx_submitted);
612+
611613
retval = usb_submit_urb(urb, GFP_ATOMIC);
614+
if (!retval)
615+
return;
616+
617+
usb_unanchor_urb(urb);
612618

613619
if (retval == -ENODEV)
614620
netif_device_detach(netdev);
615-
else if (retval)
621+
else
616622
netdev_err(netdev, "failed resubmitting read bulk urb: %d\n",
617623
retval);
618624
}

0 commit comments

Comments
 (0)