Skip to content

Commit 928150f

Browse files
pskrgagmarckleinebudde
authored andcommitted
can: esd_usb2: fix memory leak
In esd_usb2_setup_rx_urbs() MAX_RX_URBS coherent buffers are allocated and there is nothing, that frees them: 1) In callback function the urb is resubmitted and that's all 2) In disconnect function urbs are simply killed, but URB_FREE_BUFFER is not set (see esd_usb2_setup_rx_urbs) and this flag cannot be used with coherent buffers. So, all allocated buffers should be freed with usb_free_coherent() explicitly. Side note: This code looks like a copy-paste of other can drivers. The same patch was applied to mcba_usb driver and it works nice with real hardware. There is no change in functionality, only clean-up code for coherent buffers. Fixes: 96d8e90 ("can: Add driver for esd CAN-USB/2 device") Link: https://lore.kernel.org/r/b31b096926dcb35998ad0271aac4b51770ca7cc8.1627404470.git.paskripkin@gmail.com Cc: linux-stable <[email protected]> Signed-off-by: Pavel Skripkin <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 9969e3c commit 928150f

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

drivers/net/can/usb/esd_usb2.c

+15-1
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,8 @@ struct esd_usb2 {
195195
int net_count;
196196
u32 version;
197197
int rxinitdone;
198+
void *rxbuf[MAX_RX_URBS];
199+
dma_addr_t rxbuf_dma[MAX_RX_URBS];
198200
};
199201

200202
struct esd_usb2_net_priv {
@@ -545,6 +547,7 @@ static int esd_usb2_setup_rx_urbs(struct esd_usb2 *dev)
545547
for (i = 0; i < MAX_RX_URBS; i++) {
546548
struct urb *urb = NULL;
547549
u8 *buf = NULL;
550+
dma_addr_t buf_dma;
548551

549552
/* create a URB, and a buffer for it */
550553
urb = usb_alloc_urb(0, GFP_KERNEL);
@@ -554,14 +557,16 @@ static int esd_usb2_setup_rx_urbs(struct esd_usb2 *dev)
554557
}
555558

556559
buf = usb_alloc_coherent(dev->udev, RX_BUFFER_SIZE, GFP_KERNEL,
557-
&urb->transfer_dma);
560+
&buf_dma);
558561
if (!buf) {
559562
dev_warn(dev->udev->dev.parent,
560563
"No memory left for USB buffer\n");
561564
err = -ENOMEM;
562565
goto freeurb;
563566
}
564567

568+
urb->transfer_dma = buf_dma;
569+
565570
usb_fill_bulk_urb(urb, dev->udev,
566571
usb_rcvbulkpipe(dev->udev, 1),
567572
buf, RX_BUFFER_SIZE,
@@ -574,8 +579,12 @@ static int esd_usb2_setup_rx_urbs(struct esd_usb2 *dev)
574579
usb_unanchor_urb(urb);
575580
usb_free_coherent(dev->udev, RX_BUFFER_SIZE, buf,
576581
urb->transfer_dma);
582+
goto freeurb;
577583
}
578584

585+
dev->rxbuf[i] = buf;
586+
dev->rxbuf_dma[i] = buf_dma;
587+
579588
freeurb:
580589
/* Drop reference, USB core will take care of freeing it */
581590
usb_free_urb(urb);
@@ -663,6 +672,11 @@ static void unlink_all_urbs(struct esd_usb2 *dev)
663672
int i, j;
664673

665674
usb_kill_anchored_urbs(&dev->rx_submitted);
675+
676+
for (i = 0; i < MAX_RX_URBS; ++i)
677+
usb_free_coherent(dev->udev, RX_BUFFER_SIZE,
678+
dev->rxbuf[i], dev->rxbuf_dma[i]);
679+
666680
for (i = 0; i < dev->net_count; i++) {
667681
priv = dev->nets[i];
668682
if (priv) {

0 commit comments

Comments
 (0)