diff options
| author | Johan Hovold <jhovold@gmail.com> | 2014-05-26 19:22:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-30 20:01:32 -0700 |
| commit | edc71a5ebfed93d04c5648a6e9f94a5358d46aa0 (patch) | |
| tree | 6c7b591aa4a43642caf0d1679d66739cb007cacd /drivers/usb/serial/sierra.c | |
| parent | fe8dec3ea2a9e1105ca5ae46f2baa1c9935923b3 (diff) | |
| download | lwn-edc71a5ebfed93d04c5648a6e9f94a5358d46aa0.tar.gz lwn-edc71a5ebfed93d04c5648a6e9f94a5358d46aa0.zip | |
USB: sierra: fix urb and memory leak on disconnect
commit 014333f77c0b71123d6ef7d31a9724e0699c9548 upstream.
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")
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.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index da5fa46f7a8a..af43ddfd8954 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c @@ -801,6 +801,7 @@ static void sierra_close(struct usb_serial_port *port) struct usb_serial *serial = port->serial; struct sierra_port_private *portdata; struct sierra_intf_private *intfdata = port->serial->private; + struct urb *urb; dev_dbg(&port->dev, "%s\n", __func__); @@ -825,6 +826,17 @@ static void sierra_close(struct usb_serial_port *port) portdata->opened = 0; spin_unlock_irq(&intfdata->susp_lock); + for (;;) { + urb = usb_get_from_anchor(&portdata->delayed); + if (!urb) + break; + kfree(urb->transfer_buffer); + usb_free_urb(urb); + usb_autopm_put_interface_async(serial->interface); + spin_lock(&portdata->lock); + portdata->outstanding_urbs--; + spin_unlock(&portdata->lock); + } /* Stop reading urbs */ sierra_stop_rx_urbs(port); |