diff options
| author | Mathias Nyman <mathias.nyman@linux.intel.com> | 2016-01-26 17:50:12 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-02-25 10:49:13 +0100 |
| commit | f555d8c469b4e693510b7d4486b9cf200d2ba930 (patch) | |
| tree | 710b62755466f834e9ec1325481390a20e061725 | |
| parent | 5a0451620e5c3ab83fbfd27d9103d0d6192d46d8 (diff) | |
| download | lwn-f555d8c469b4e693510b7d4486b9cf200d2ba930.tar.gz lwn-f555d8c469b4e693510b7d4486b9cf200d2ba930.zip | |
xhci: Fix list corruption in urb dequeue at host removal
commit 5c82171167adb8e4ac77b91a42cd49fb211a81a0 upstream.
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.
Reported-by: Joe Lawrence <joe.lawrence@stratus.com>
Tested-by: Joe Lawrence <joe.lawrence@stratus.com>
Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | drivers/usb/host/xhci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index dfcf0a3527b8..806ed2ba1c6e 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -1522,7 +1522,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); |