Commit bd13437d authored by Mathias Nyman's avatar Mathias Nyman Committed by Zheng Yejian
Browse files

xhci: avoid race between disable slot command and host runtime suspend 

stable inclusion
from stable-v4.19.221
commit cc7c2818c71ebace207df40cc586c8c74e3d1a59
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IALLDG
CVE: CVE-2023-52898

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=cc7c2818c71ebace207df40cc586c8c74e3d1a59



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

commit 7faac195 upstream.

Make xhci_disable_slot() synchronous, thus ensuring it, and
xhci_free_dev() calling it return after xHC controller completes
the disable slot command.

Otherwise the roothub and xHC host may runtime suspend, and clear the
command ring while the disable slot command is being processed.

This causes a command completion mismatch as the completion event can't
be mapped to the correct command.
Command ring gets out of sync and commands time out.
Driver finally assumes host is unresponsive and bails out.

usb 2-4: USB disconnect, device number 10
xhci_hcd 0000:00:0d.0: ERROR mismatched command completion event
...
xhci_hcd 0000:00:0d.0: xHCI host controller not responding, assume dead
xhci_hcd 0000:00:0d.0: HC died; cleaning up

Cc: <stable@vger.kernel.org>
Conflicts:
	drivers/usb/host/xhci.c
[Resolve conflicts due to previous bugfix]
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20211210141735.1384209-3-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZheng Yejian <zhengyejian1@huawei.com>
parent 611f0fce

drivers/usb/host/xhci-hub.c

+1 −0
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci, 
			continue;



		retval = xhci_disable_slot(xhci, i);

		xhci_free_virt_device(xhci, i);

		if (retval)

			xhci_err(xhci, "Failed to disable slot %d, %d. Enter test mode anyway\n",

				 i, retval);

drivers/usb/host/xhci-ring.c

+0 −1
Original line number Diff line number Diff line
@@ -1198,7 +1198,6 @@ static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id) 
	if (xhci->quirks & XHCI_EP_LIMIT_QUIRK)

		/* Delete default control endpoint resources */

		xhci_free_device_endpoint_resources(xhci, virt_dev, true);

	xhci_free_virt_device(xhci, slot_id);

}



static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id,

drivers/usb/host/xhci.c

+15 −7
Original line number Diff line number Diff line
@@ -3803,8 +3803,7 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev) 
		del_timer_sync(&virt_dev->eps[i].stop_cmd_timer);

	}

	virt_dev->udev = NULL;

	ret = xhci_disable_slot(xhci, udev->slot_id);

	if (ret)

	xhci_disable_slot(xhci, udev->slot_id);

	xhci_free_virt_device(xhci, udev->slot_id);

}
@@ -3815,7 +3814,7 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id) 
	u32 state;

	int ret = 0;



	command = xhci_alloc_command(xhci, false, GFP_KERNEL);

	command = xhci_alloc_command(xhci, true, GFP_KERNEL);

	if (!command)

		return -ENOMEM;
@@ -3840,6 +3839,15 @@ int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id) 
	}

	xhci_ring_cmd_db(xhci);

	spin_unlock_irqrestore(&xhci->lock, flags);



	wait_for_completion(command->completion);



	if (command->status != COMP_SUCCESS)

		xhci_warn(xhci, "Unsuccessful disable slot %u command, status %d\n",

			  slot_id, command->status);



	xhci_free_command(xhci, command);



	return ret;

}
@@ -3950,8 +3958,7 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev) 
	return 1;



disable_slot:

	ret = xhci_disable_slot(xhci, udev->slot_id);

	if (ret)

	xhci_disable_slot(xhci, udev->slot_id);

	xhci_free_virt_device(xhci, udev->slot_id);



	return 0;
@@ -4081,6 +4088,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev, 


		mutex_unlock(&xhci->mutex);

		ret = xhci_disable_slot(xhci, udev->slot_id);

		xhci_free_virt_device(xhci, udev->slot_id);

		if (!ret)

			xhci_alloc_dev(hcd, udev);

		kfree(command->completion);