lkml.org 
[lkml]   [2018]   [Aug]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 16/35] USB: serial: sierra: fix potential deadlock at close
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: John Ogness <john.ogness@linutronix.de>

    commit e60870012e5a35b1506d7b376fddfb30e9da0b27 upstream.

    The portdata spinlock can be taken in interrupt context (via
    sierra_outdat_callback()).
    Disable interrupts when taking the portdata spinlock when discarding
    deferred URBs during close to prevent a possible deadlock.

    Fixes: 014333f77c0b ("USB: sierra: fix urb and memory leak on disconnect")
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: John Ogness <john.ogness@linutronix.de>
    Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
    [ johan: amend commit message and add fixes and stable tags ]
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/usb/serial/sierra.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/usb/serial/sierra.c
    +++ b/drivers/usb/serial/sierra.c
    @@ -770,9 +770,9 @@ static void sierra_close(struct usb_seri
    kfree(urb->transfer_buffer);
    usb_free_urb(urb);
    usb_autopm_put_interface_async(serial->interface);
    - spin_lock(&portdata->lock);
    + spin_lock_irq(&portdata->lock);
    portdata->outstanding_urbs--;
    - spin_unlock(&portdata->lock);
    + spin_unlock_irq(&portdata->lock);
    }

    sierra_stop_rx_urbs(port);

    \
     
     \ /
      Last update: 2018-08-21 08:32    [W:4.016 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site