lkml.org 
[lkml]   [2012]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 198/241] net: usb: Fix memory leak on Tx data path
    Date
    3.5.7.2 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Hemant Kumar <hemantk@codeaurora.org>

    commit 39707c2a3ba5011038b363f84d37c8a98d2d9db1 upstream.

    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: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
    ---
    drivers/net/usb/usbnet.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
    index f2716a4..a936201 100644
    --- a/drivers/net/usb/usbnet.c
    +++ b/drivers/net/usb/usbnet.c
    @@ -1161,6 +1161,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;
    @@ -1313,6 +1314,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);

    --
    1.7.9.5


    \
     
     \ /
      Last update: 2012-12-13 16:01    [W:4.077 / U:1.476 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site