lkml.org 
[lkml]   [2014]   [Jun]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 133/181] USB: sierra: fix AA deadlock in open error path
    Date
    From: Johan Hovold <jhovold@gmail.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/usb/serial/sierra.c | 21 +++++++++++++--------
    1 file changed, 13 insertions(+), 8 deletions(-)

    diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
    index b6910b7ab7e2..b3f2b60465bd 100644
    --- a/drivers/usb/serial/sierra.c
    +++ b/drivers/usb/serial/sierra.c
    @@ -824,14 +824,9 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
    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;
    @@ -841,6 +836,16 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
    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;
    }


    --
    2.0.0


    \
     
     \ /
      Last update: 2014-06-30 15:21    [W:2.337 / U:0.256 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site