| From de3a096efae4f524ec9c52c54f73c9974fd06c25 Mon Sep 17 00:00:00 2001 |
| From: Hemant Kumar <hemantk@codeaurora.org> |
| Date: Thu, 25 Oct 2012 18:17:54 +0000 |
| Subject: net: usb: Fix memory leak on Tx data path |
| |
| |
| From: Hemant Kumar <hemantk@codeaurora.org> |
| |
| [ Upstream commit 39707c2a3ba5011038b363f84d37c8a98d2d9db1 ] |
| |
| Driver anchors the tx urbs and defers the urb submission if |
| a transmit request comes when the interface is suspended. |
| Anchoring urb increments the urb reference count. These |
| deferred urbs are later accessed by calling usb_get_from_anchor() |
| for submission during interface resume. usb_get_from_anchor() |
| unanchors the urb but urb reference count remains same. |
| This causes the urb reference count to remain non-zero |
| after usb_free_urb() gets called and urb never gets freed. |
| Hence call usb_put_urb() after anchoring the urb to properly |
| balance the reference count for these deferred urbs. Also, |
| unanchor these deferred urbs during disconnect, to free them |
| up. |
| |
| Signed-off-by: Hemant Kumar <hemantk@codeaurora.org> |
| Acked-by: Oliver Neukum <oneukum@suse.de> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/usb/usbnet.c | 3 +++ |
| 1 file changed, 3 insertions(+) |
| |
| --- a/drivers/net/usb/usbnet.c |
| +++ b/drivers/net/usb/usbnet.c |
| @@ -1149,6 +1149,7 @@ netdev_tx_t usbnet_start_xmit (struct sk |
| usb_anchor_urb(urb, &dev->deferred); |
| /* no use to process more packets */ |
| netif_stop_queue(net); |
| + usb_put_urb(urb); |
| spin_unlock_irqrestore(&dev->txq.lock, flags); |
| netdev_dbg(dev->net, "Delaying transmission for resumption\n"); |
| goto deferred; |
| @@ -1290,6 +1291,8 @@ void usbnet_disconnect (struct usb_inter |
| |
| cancel_work_sync(&dev->kevent); |
| |
| + usb_scuttle_anchored_urbs(&dev->deferred); |
| + |
| if (dev->driver_info->unbind) |
| dev->driver_info->unbind (dev, intf); |
| |
