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

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

xhci: handle port status events for removed USB3 hcd 



commit 1245374e9b8340fc255fd51b2015173a83050d03 upstream.

At xhci removal the USB3 hcd (shared_hcd) is removed before the primary
USB2 hcd. Interrupts for port status changes may still occur for USB3
ports after the shared_hcd is freed, causing  NULL pointer dereference.

Check if xhci->shared_hcd is still valid before handing USB3 port events

Cc: <stable@vger.kernel.org>
Reported-by: default avatarPeter Chen <peter.chen@nxp.com>
Tested-by: default avatarJack Pham <jackp@codeaurora.org>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Cc: Macpaul Lin <macpaul.lin@mediatek.com>
[redone for 4.14.y based on Mathias's comments]
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec6ddb1a

drivers/usb/host/xhci-ring.c

+6 −0
Original line number Diff line number Diff line
@@ -1640,6 +1640,12 @@ static void handle_port_status(struct xhci_hcd *xhci, 
	if ((major_revision == 0x03) != (hcd->speed >= HCD_USB3))

		hcd = xhci->shared_hcd;



	if (!hcd) {

		xhci_dbg(xhci, "No hcd found for port %u event\n", port_id);

		bogus_port_status = true;

		goto cleanup;

	}



	if (major_revision == 0) {

		xhci_warn(xhci, "Event for port %u not in "

				"Extended Capabilities, ignoring.\n",