diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-03 17:10:39 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-03 17:10:39 +0100 |
| commit | ba2dfe6f6f4825d462052a38356eafee40f24a75 (patch) | |
| tree | d87fb7580601d271431418d7873a112e189f207c /hw/usb | |
| parent | f988c7e191141e92de2059d04a5f9a9bb01f399c (diff) | |
| parent | 8f36ec708834dfad58af6feb0b69bb0be6077f0f (diff) | |
| download | qemu-ba2dfe6f6f4825d462052a38356eafee40f24a75.zip qemu-ba2dfe6f6f4825d462052a38356eafee40f24a75.tar.gz qemu-ba2dfe6f6f4825d462052a38356eafee40f24a75.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180703-pull-request' into staging
usb: bugfixes for ehci and xhci.
# gpg: Signature made Tue 03 Jul 2018 09:26:20 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/usb-20180703-pull-request:
xhci: fix guest-triggerable assert
ehci: Don't fetch a NULL current qtd but advance the queue instead.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/hcd-ehci.c | 3 | ||||
| -rw-r--r-- | hw/usb/hcd-xhci.c | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 01342326..e5acfc5 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -1672,7 +1672,8 @@ static EHCIQueue *ehci_state_fetchqh(EHCIState *ehci, int async) ehci_set_state(ehci, async, EST_HORIZONTALQH); } else if ((q->qh.token & QTD_TOKEN_ACTIVE) && - (NLPTR_TBIT(q->qh.current_qtd) == 0)) { + (NLPTR_TBIT(q->qh.current_qtd) == 0) && + (q->qh.current_qtd != 0)) { q->qtdaddr = q->qh.current_qtd; ehci_set_state(ehci, async, EST_FETCHQTD); diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 721beb5..8f1a01a 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -1954,7 +1954,12 @@ static void xhci_kick_epctx(XHCIEPContext *epctx, unsigned int streamid) for (i = 0; i < length; i++) { TRBType type; type = xhci_ring_fetch(xhci, ring, &xfer->trbs[i], NULL); - assert(type); + if (!type) { + xhci_die(xhci); + xhci_ep_free_xfer(xfer); + epctx->kick_active--; + return; + } } xfer->streamid = streamid; |