From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, John Ogness <john.ogness@linutronix.de>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
Johan Hovold <johan@kernel.org>
Subject: [PATCH 4.4 15/22] USB: serial: sierra: fix potential deadlock at close
Date: Tue, 21 Aug 2018 08:21:41 +0200 [thread overview]
Message-ID: <20180821055140.230645877@linuxfoundation.org> (raw)
In-Reply-To: <20180821055139.462620042@linuxfoundation.org>
4.4-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
@@ -790,9 +790,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);
next prev parent reply other threads:[~2018-08-21 6:34 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 6:21 [PATCH 4.4 00/22] 4.4.151-stable review Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 01/22] dccp: fix undefined behavior with cwnd shift in ccid2_cwnd_restart() Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 02/22] l2tp: use sk_dst_check() to avoid race on sk->sk_dst_cache Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 03/22] llc: use refcount_inc_not_zero() for llc_sap_find() Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 04/22] net_sched: Fix missing res info when create new tc_index filter Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 05/22] vsock: split dwork to avoid reinitializations Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 06/22] net_sched: fix NULL pointer dereference when delete tcindex filter Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 07/22] ALSA: hda - Sleep for 10ms after entering D3 on Conexant codecs Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 08/22] ALSA: hda - Turn CX8200 into D3 as well upon reboot Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 09/22] ALSA: vx222: Fix invalid endian conversions Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 10/22] ALSA: virmidi: Fix too long output trigger loop Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 11/22] ALSA: cs5535audio: Fix invalid endian conversion Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 12/22] ALSA: hda: Correct Asrock B85M-ITX power_save blacklist entry Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 13/22] ALSA: memalloc: Dont exceed over the requested size Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 14/22] ALSA: vxpocket: Fix invalid endian conversions Greg Kroah-Hartman
2018-08-21 6:21 ` Greg Kroah-Hartman [this message]
2018-08-21 6:21 ` [PATCH 4.4 16/22] USB: option: add support for DW5821e Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 17/22] ACPI: save NVS memory for Lenovo G50-45 Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 18/22] ACPI / PM: save NVS memory for ASUS 1025C laptop Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 19/22] serial: 8250_dw: always set baud rate in dw8250_set_termios Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 21/22] Bluetooth: avoid killing an already killed socket Greg Kroah-Hartman
2018-08-21 6:21 ` [PATCH 4.4 22/22] isdn: Disable IIOCDBGVAR Greg Kroah-Hartman
2018-08-21 14:55 ` [PATCH 4.4 00/22] 4.4.151-stable review Guenter Roeck
2018-08-21 16:58 ` Naresh Kamboju
2018-08-21 22:01 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180821055140.230645877@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=bigeasy@linutronix.de \
--cc=johan@kernel.org \
--cc=john.ogness@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).