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

xhci: Fix null pointer dereference in remove if xHC has only one roothub 



[ Upstream commit 4a593a62 ]

The remove path in xhci platform driver tries to remove and put both main
and shared hcds even if only a main hcd exists (one roothub)

This causes a null pointer dereference in reboot for those controllers.

Check that the shared_hcd exists before trying to remove it.

Fixes: e0fe9869 ("usb: host: xhci-plat: prepare operation w/o shared hcd")
Reported-by: default avatarAlexey Sheplyakov <asheplyakov@basealt.ru>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20220825150840.132216-2-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 1f67a7c6

drivers/usb/host/xhci-plat.c

+8 −3
Original line number Diff line number Diff line
@@ -398,11 +398,16 @@ static int xhci_plat_remove(struct platform_device *dev) 
	pm_runtime_get_sync(&dev->dev);

	xhci->xhc_state |= XHCI_STATE_REMOVING;



	if (shared_hcd) {

		usb_remove_hcd(shared_hcd);

		xhci->shared_hcd = NULL;

	}



	usb_phy_shutdown(hcd->usb_phy);



	usb_remove_hcd(hcd);



	if (shared_hcd)

		usb_put_hcd(shared_hcd);



	clk_disable_unprepare(clk);