| From 353fe198602e8b4d1c7bdcceb8e60955087201b1 Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <jhovold@gmail.com> |
| Date: Mon, 26 May 2014 19:22:50 +0200 |
| Subject: USB: sierra: fix AA deadlock in open error path |
| |
| From: Johan Hovold <jhovold@gmail.com> |
| |
| commit 353fe198602e8b4d1c7bdcceb8e60955087201b1 upstream. |
| |
| Fix AA deadlock in open error path that would call close() and try to |
| grab the already held disc_mutex. |
| |
| Fixes: b9a44bc19f48 ("sierra: driver urb handling improvements") |
| |
| Signed-off-by: Johan Hovold <jhovold@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/serial/sierra.c | 21 +++++++++++++-------- |
| 1 file changed, 13 insertions(+), 8 deletions(-) |
| |
| --- a/drivers/usb/serial/sierra.c |
| +++ b/drivers/usb/serial/sierra.c |
| @@ -816,14 +816,9 @@ static int sierra_open(struct tty_struct |
| usb_sndbulkpipe(serial->dev, endpoint) | USB_DIR_IN); |
| |
| err = sierra_submit_rx_urbs(port, GFP_KERNEL); |
| - if (err) { |
| - /* get rid of everything as in close */ |
| - sierra_close(port); |
| - /* restore balance for autopm */ |
| - if (!serial->disconnected) |
| - usb_autopm_put_interface(serial->interface); |
| - return err; |
| - } |
| + if (err) |
| + goto err_submit; |
| + |
| sierra_send_setup(port); |
| |
| serial->interface->needs_remote_wakeup = 1; |
| @@ -833,6 +828,16 @@ static int sierra_open(struct tty_struct |
| usb_autopm_put_interface(serial->interface); |
| |
| return 0; |
| + |
| +err_submit: |
| + sierra_stop_rx_urbs(port); |
| + |
| + for (i = 0; i < portdata->num_in_urbs; i++) { |
| + sierra_release_urb(portdata->in_urbs[i]); |
| + portdata->in_urbs[i] = NULL; |
| + } |
| + |
| + return err; |
| } |
| |
| |