diff options
| author | Hemant Kumar <hemantk@codeaurora.org> | 2012-10-25 18:17:54 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-10-26 03:43:15 -0400 |
| commit | 39707c2a3ba5011038b363f84d37c8a98d2d9db1 (patch) | |
| tree | f1d0eea410e1da545fcc7230386810ed7969787b | |
| parent | bfc0d8c3de31a51e671e2c1564fd194fa6b00179 (diff) | |
| download | linux-3.10-39707c2a3ba5011038b363f84d37c8a98d2d9db1.tar.gz linux-3.10-39707c2a3ba5011038b363f84d37c8a98d2d9db1.tar.bz2 linux-3.10-39707c2a3ba5011038b363f84d37c8a98d2d9db1.zip | |
net: usb: Fix memory leak on Tx data path
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>
| -rw-r--r-- | drivers/net/usb/usbnet.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index f9819d10b1f..cb04f900cc4 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1158,6 +1158,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, 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; @@ -1310,6 +1311,8 @@ void usbnet_disconnect (struct usb_interface *intf) cancel_work_sync(&dev->kevent); + usb_scuttle_anchored_urbs(&dev->deferred); + if (dev->driver_info->unbind) dev->driver_info->unbind (dev, intf); |