ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

uhci: Properly unmap packets on cancel / invalid pid 

Packets with an invalid pid, or which were cancelled have
usb_packet_map() called on them on init, but not usb_packet_unmap()
before being freed.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Hans de Goede 2012-10-24 18:13:57 +02:00 committed by Gerd Hoffmann
parent a8170e5e97
commit 00a0770de3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/usb/hcd-uhci.c
View File

@ -236,6 +236,7 @@ static void uhci_async_cancel(UHCIAsync *async)
trace_usb_uhci_packet_cancel(async->queue->token, async->td, async->done); trace_usb_uhci_packet_cancel(async->queue->token, async->td, async->done);
if (!async->done) if (!async->done)
usb_cancel_packet(&async->packet); usb_cancel_packet(&async->packet);
usb_packet_unmap(&async->packet, &async->sgl);
uhci_async_free(async); uhci_async_free(async);
} }
@ -887,6 +888,7 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td,
default: default:
/* invalid pid : frame interrupted */ /* invalid pid : frame interrupted */
usb_packet_unmap(&async->packet, &async->sgl);
uhci_async_free(async); uhci_async_free(async);
s->status |= UHCI_STS_HCPERR; s->status |= UHCI_STS_HCPERR;
uhci_update_irq(s); uhci_update_irq(s);