Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

xhci: sideband: don't dereference freed ring when removing sideband endpoint

xhci_sideband_remove_endpoint() incorrecly assumes that the endpoint is
running and has a valid transfer ring.

Lianqin reported a crash during suspend/wake-up stress testing, and
found the cause to be dereferencing a non-existing transfer ring
'ep->ring' during xhci_sideband_remove_endpoint().

The endpoint and its ring may be in unknown state if this function
is called after xHCI was reinitialized in resume (lost power), or if
device is being re-enumerated, disconnected or endpoint already dropped.

Fix this by both removing unnecessary ring access, and by checking
ep->ring exists before dereferencing it. Also make sure endpoint is
running before attempting to stop it.

Remove the xhci_initialize_ring_info() call during sideband endpoint
removal as is it only initializes ring structure enqueue, dequeue and
cycle state values to their starting values without changing actual
hardware enqueue, dequeue and cycle state. Leaving them out of sync
is worse than leaving it as it is. The endpoint will get freed in after
this in most usecases.

If the (audio) class driver want's to reuse the endpoint after offload
then it is up to the class driver to ensure endpoint is properly set up.

Reported-by: 胡连勤 <hulianqin@vivo.com>
Closes: https://lore.kernel.org/linux-usb/TYUPR06MB6217B105B059A7730C4F6EC8D2B9A@TYUPR06MB6217.apcprd06.prod.outlook.com/
Tested-by: 胡连勤 <hulianqin@vivo.com>
Fixes: de66754e9f80 ("xhci: sideband: add initial api to register a secondary interrupter entity")
Cc: stable@vger.kernel.org
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://patch.msgid.link/20260115233758.364097-2-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Mathias Nyman and committed by
Greg Kroah-Hartman
dd83dc12 9fa015bd

+12 -4
-1
drivers/usb/host/xhci-sideband.c
··· 210 210 return -ENODEV; 211 211 212 212 __xhci_sideband_remove_endpoint(sb, ep); 213 - xhci_initialize_ring_info(ep->ring); 214 213 215 214 return 0; 216 215 }
+12 -3
drivers/usb/host/xhci.c
··· 2898 2898 gfp_t gfp_flags) 2899 2899 { 2900 2900 struct xhci_command *command; 2901 + struct xhci_ep_ctx *ep_ctx; 2901 2902 unsigned long flags; 2902 - int ret; 2903 + int ret = -ENODEV; 2903 2904 2904 2905 command = xhci_alloc_command(xhci, true, gfp_flags); 2905 2906 if (!command) 2906 2907 return -ENOMEM; 2907 2908 2908 2909 spin_lock_irqsave(&xhci->lock, flags); 2909 - ret = xhci_queue_stop_endpoint(xhci, command, ep->vdev->slot_id, 2910 - ep->ep_index, suspend); 2910 + 2911 + /* make sure endpoint exists and is running before stopping it */ 2912 + if (ep->ring) { 2913 + ep_ctx = xhci_get_ep_ctx(xhci, ep->vdev->out_ctx, ep->ep_index); 2914 + if (GET_EP_CTX_STATE(ep_ctx) == EP_STATE_RUNNING) 2915 + ret = xhci_queue_stop_endpoint(xhci, command, 2916 + ep->vdev->slot_id, 2917 + ep->ep_index, suspend); 2918 + } 2919 + 2911 2920 if (ret < 0) { 2912 2921 spin_unlock_irqrestore(&xhci->lock, flags); 2913 2922 goto out;