aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/sierra.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2014-05-26 13:22:53 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-27 18:04:02 -0400
commit014333f77c0b71123d6ef7d31a9724e0699c9548 (patch)
tree92f1f6b56bc2f167166de7811cf03f77c7ba2706 /drivers/usb/serial/sierra.c
parent7fdd26a01eb7b6cb6855ff8f69ef4a720720dfcb (diff)
USB: sierra: fix urb and memory leak on disconnect
The delayed-write queue was never emptied on disconnect, something which would lead to leaked urbs and transfer buffers if the device is disconnected before being runtime resumed due to a write. Fixes: e6929a9020ac ("USB: support for autosuspend in sierra while online") Cc: <stable@vger.kernel.org> # v2.6.32 Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial/sierra.c')
-rw-r--r--drivers/usb/serial/sierra.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index dd9820d3fa03..1a42649253a5 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -759,6 +759,7 @@ static void sierra_close(struct usb_serial_port *port)
759 struct usb_serial *serial = port->serial; 759 struct usb_serial *serial = port->serial;
760 struct sierra_port_private *portdata; 760 struct sierra_port_private *portdata;
761 struct sierra_intf_private *intfdata = port->serial->private; 761 struct sierra_intf_private *intfdata = port->serial->private;
762 struct urb *urb;
762 763
763 portdata = usb_get_serial_port_data(port); 764 portdata = usb_get_serial_port_data(port);
764 765
@@ -780,6 +781,18 @@ static void sierra_close(struct usb_serial_port *port)
780 portdata->opened = 0; 781 portdata->opened = 0;
781 spin_unlock_irq(&intfdata->susp_lock); 782 spin_unlock_irq(&intfdata->susp_lock);
782 783
784 for (;;) {
785 urb = usb_get_from_anchor(&portdata->delayed);
786 if (!urb)
787 break;
788 kfree(urb->transfer_buffer);
789 usb_free_urb(urb);
790 usb_autopm_put_interface_async(serial->interface);
791 spin_lock(&portdata->lock);
792 portdata->outstanding_urbs--;
793 spin_unlock(&portdata->lock);
794 }
795
783 sierra_stop_rx_urbs(port); 796 sierra_stop_rx_urbs(port);
784 for (i = 0; i < portdata->num_in_urbs; i++) { 797 for (i = 0; i < portdata->num_in_urbs; i++) {
785 sierra_release_urb(portdata->in_urbs[i]); 798 sierra_release_urb(portdata->in_urbs[i]);