Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d03d9633 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: make sure interrupts are restored to correct state 



[ Upstream commit bd82873f23c9a6ad834348f8b83f3b6a5bca2c65 ]

spin_unlock_irqrestore() might be called with stale flags after
reading port status, possibly restoring interrupts to a incorrect
state.

If a usb2 port just finished resuming while the port status is read
the spin lock will be temporary released and re-acquired in a separate
function. The flags parameter is passed as value instead of a pointer,
not updating flags properly before the final spin_unlock_irqrestore()
is called.

Cc: <stable@vger.kernel.org> # v3.12+
Fixes: 8b3d4570 ("usb: Fix xHCI host issues on remote wakeup.")
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20191211142007.8847-7-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 64a8c501

drivers/usb/host/xhci-hub.c

+4 −4
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static u32 xhci_get_ext_port_status(u32 raw_port_status, u32 port_li) 
static u32 xhci_get_port_status(struct usb_hcd *hcd,

		struct xhci_bus_state *bus_state,

	u16 wIndex, u32 raw_port_status,

		unsigned long flags)

		unsigned long *flags)

	__releases(&xhci->lock)

	__acquires(&xhci->lock)

{
@@ -917,12 +917,12 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd, 
			xhci_test_and_clear_bit(xhci, port, PORT_PLC);

			xhci_set_link_state(xhci, port, XDEV_U0);



			spin_unlock_irqrestore(&xhci->lock, flags);

			spin_unlock_irqrestore(&xhci->lock, *flags);

			time_left = wait_for_completion_timeout(

					&bus_state->rexit_done[wIndex],

					msecs_to_jiffies(

						XHCI_MAX_REXIT_TIMEOUT_MS));

			spin_lock_irqsave(&xhci->lock, flags);

			spin_lock_irqsave(&xhci->lock, *flags);



			if (time_left) {

				slot_id = xhci_find_slot_id_by_port(hcd,
@@ -1076,7 +1076,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
		}

		trace_xhci_get_port_status(wIndex, temp);

		status = xhci_get_port_status(hcd, bus_state, wIndex, temp,

					      flags);

					      &flags);

		if (status == 0xffffffff)

			goto error;