Skip to content

Commit 0e865f0

Browse files
pskrgagmarckleinebudde
authored andcommitted
can: usb_8dev: fix memory leak
In usb_8dev_start() 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 usb_8dev_start) 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: 0024d8a ("can: usb_8dev: Add support for USB2CAN interface from 8 devices") Link: https://lore.kernel.org/r/d39b458cd425a1cf7f512f340224e6e9563b07bd.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 fc43fb6 commit 0e865f0

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

drivers/net/can/usb/usb_8dev.c

+13-2
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ struct usb_8dev_priv {
137137
u8 *cmd_msg_buffer;
138138

139139
struct mutex usb_8dev_cmd_lock;
140-
140+
void *rxbuf[MAX_RX_URBS];
141+
dma_addr_t rxbuf_dma[MAX_RX_URBS];
141142
};
142143

143144
/* tx frame */
@@ -733,6 +734,7 @@ static int usb_8dev_start(struct usb_8dev_priv *priv)
733734
for (i = 0; i < MAX_RX_URBS; i++) {
734735
struct urb *urb = NULL;
735736
u8 *buf;
737+
dma_addr_t buf_dma;
736738

737739
/* create a URB, and a buffer for it */
738740
urb = usb_alloc_urb(0, GFP_KERNEL);
@@ -742,14 +744,16 @@ static int usb_8dev_start(struct usb_8dev_priv *priv)
742744
}
743745

744746
buf = usb_alloc_coherent(priv->udev, RX_BUFFER_SIZE, GFP_KERNEL,
745-
&urb->transfer_dma);
747+
&buf_dma);
746748
if (!buf) {
747749
netdev_err(netdev, "No memory left for USB buffer\n");
748750
usb_free_urb(urb);
749751
err = -ENOMEM;
750752
break;
751753
}
752754

755+
urb->transfer_dma = buf_dma;
756+
753757
usb_fill_bulk_urb(urb, priv->udev,
754758
usb_rcvbulkpipe(priv->udev,
755759
USB_8DEV_ENDP_DATA_RX),
@@ -767,6 +771,9 @@ static int usb_8dev_start(struct usb_8dev_priv *priv)
767771
break;
768772
}
769773

774+
priv->rxbuf[i] = buf;
775+
priv->rxbuf_dma[i] = buf_dma;
776+
770777
/* Drop reference, USB core will take care of freeing it */
771778
usb_free_urb(urb);
772779
}
@@ -836,6 +843,10 @@ static void unlink_all_urbs(struct usb_8dev_priv *priv)
836843

837844
usb_kill_anchored_urbs(&priv->rx_submitted);
838845

846+
for (i = 0; i < MAX_RX_URBS; ++i)
847+
usb_free_coherent(priv->udev, RX_BUFFER_SIZE,
848+
priv->rxbuf[i], priv->rxbuf_dma[i]);
849+
839850
usb_kill_anchored_urbs(&priv->tx_submitted);
840851
atomic_set(&priv->active_tx_urbs, 0);
841852

0 commit comments

Comments
 (0)