Commit 491d68d9 authored by Roman Kagan's avatar Roman Kagan Committed by Gerd Hoffmann
Browse files

usb:xhci: no DMA on HC reset 



This patch is a rough fix to a memory corruption we are observing when
running VMs with xhci USB controller and OVMF firmware.

Specifically, on the following call chain

xhci_reset
  xhci_disable_slot
    xhci_disable_ep
      xhci_set_ep_state

QEMU overwrites guest memory using stale guest addresses.

This doesn't happen when the guest (firmware) driver sets up xhci for
the first time as there are no slots configured yet.  However when the
firmware hands over the control to the OS some slots and endpoints are
already set up with their context in the guest RAM.  Now the OS' driver
resets the controller again and xhci_set_ep_state then reads and writes
that memory which is now owned by the OS.

As a quick fix, skip calling xhci_set_ep_state in xhci_disable_ep if the
device context base address array pointer is zero (indicating we're in
the HC reset and no DMA is possible).

Cc: qemu-stable@nongnu.org
Signed-off-by: default avatarRoman Kagan <rkagan@virtuozzo.com>
Message-id: 1462384435-1034-1-git-send-email-rkagan@virtuozzo.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 860a3b34

hw/usb/hcd-xhci.c

+4 −1
Original line number Diff line number Diff line
@@ -1531,7 +1531,10 @@ static TRBCCode xhci_disable_ep(XHCIState *xhci, unsigned int slotid, 
        usb_packet_cleanup(&epctx->transfers[i].packet);

    }



    /* only touch guest RAM if we're not resetting the HC */

    if (xhci->dcbaap_low || xhci->dcbaap_high) {

        xhci_set_ep_state(xhci, epctx, NULL, EP_DISABLED);

    }



    timer_free(epctx->kick_timer);

    g_free(epctx);