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

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

xhci: Fix list corruption in urb dequeue at host removal 



xhci driver frees data for all devices, both usb2 and and usb3 the
first time usb_remove_hcd() is called, including td_list and and xhci_ring
structures.

When usb_remove_hcd() is called a second time for the second xhci bus it
will try to dequeue all pending urbs, and touches td_list which is already
freed for that endpoint.

Cc: <stable@vger.kernel.org>
Reported-by: default avatarJoe Lawrence <joe.lawrence@stratus.com>
Tested-by: default avatarJoe Lawrence <joe.lawrence@stratus.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ad294d5

drivers/usb/host/xhci.c

+3 −1
Original line number Diff line number Diff line
@@ -1554,7 +1554,9 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) 
		xhci_dbg_trace(xhci, trace_xhci_dbg_cancel_urb,

				"HW died, freeing TD.");

		urb_priv = urb->hcpriv;

		for (i = urb_priv->td_cnt; i < urb_priv->length; i++) {

		for (i = urb_priv->td_cnt;

		     i < urb_priv->length && xhci->devs[urb->dev->slot_id];

		     i++) {

			td = urb_priv->td[i];

			if (!list_empty(&td->td_list))

				list_del_init(&td->td_list);