Skip to content

Commit 014333f

Browse files
jhovoldgregkh
authored andcommitted
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: e6929a9 ("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>
1 parent 7fdd26a commit 014333f

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

drivers/usb/serial/sierra.c

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,7 @@ static void sierra_close(struct usb_serial_port *port)
759759
struct usb_serial *serial = port->serial;
760760
struct sierra_port_private *portdata;
761761
struct sierra_intf_private *intfdata = port->serial->private;
762+
struct urb *urb;
762763

763764
portdata = usb_get_serial_port_data(port);
764765

@@ -780,6 +781,18 @@ static void sierra_close(struct usb_serial_port *port)
780781
portdata->opened = 0;
781782
spin_unlock_irq(&intfdata->susp_lock);
782783

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+
783796
sierra_stop_rx_urbs(port);
784797
for (i = 0; i < portdata->num_in_urbs; i++) {
785798
sierra_release_urb(portdata->in_urbs[i]);

0 commit comments

Comments
 (0)