diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-12-14 14:35:26 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-01-07 12:57:23 +0100 |
| commit | 2b3de6ada5d180130ba083d5b45ed51ce8e4def2 (patch) | |
| tree | 47cc168d680fbc5191cf6818f767b57e8fbc6526 /hw/usb | |
| parent | 190d849249fd7fecbc75ec38f348197c152f4e87 (diff) | |
| download | focaccia-qemu-2b3de6ada5d180130ba083d5b45ed51ce8e4def2.tar.gz focaccia-qemu-2b3de6ada5d180130ba083d5b45ed51ce8e4def2.zip | |
ehci: writeback_async_complete_packet: verify qh and qtd
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/hcd-ehci.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 934af55dc6..96a014442c 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -192,6 +192,7 @@ static int ehci_state_executing(EHCIQueue *q); static int ehci_state_writeback(EHCIQueue *q); static int ehci_state_advqueue(EHCIQueue *q); static int ehci_fill_queue(EHCIPacket *p); +static void ehci_free_packet(EHCIPacket *p); static const char *nr2str(const char **n, size_t len, uint32_t nr) { @@ -516,8 +517,21 @@ static bool ehci_verify_qtd(EHCIPacket *p, EHCIqtd *qtd) static void ehci_writeback_async_complete_packet(EHCIPacket *p) { EHCIQueue *q = p->queue; + EHCIqtd qtd; + EHCIqh qh; int state; + /* Verify the qh + qtd, like we do when going through fetchqh & fetchqtd */ + get_dwords(q->ehci, NLPTR_GET(q->qhaddr), + (uint32_t *) &qh, sizeof(EHCIqh) >> 2); + get_dwords(q->ehci, NLPTR_GET(q->qtdaddr), + (uint32_t *) &qtd, sizeof(EHCIqtd) >> 2); + if (!ehci_verify_qh(q, &qh) || !ehci_verify_qtd(p, &qtd)) { + p->async = EHCI_ASYNC_INITIALIZED; + ehci_free_packet(p); + return; + } + state = ehci_get_state(q->ehci, q->async); ehci_state_executing(q); ehci_state_writeback(q); /* Frees the packet! */ |