SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ehci: Don't access packet after freeing it

Browse Source 
ehci_state_writeback() will free the packet, so we should not access
the packet after calling ehci_state_writeback().

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-11-14 17:21:36 +01:00 committed by Gerd Hoffmann
parent 537e8f1aa8
commit 30d68cf6e1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/usb/hcd-ehci.c
View File

@ -453,12 +453,13 @@ static EHCIPacket *ehci_alloc_packet(EHCIQueue *q)
static void ehci_free_packet(EHCIPacket *p) static void ehci_free_packet(EHCIPacket *p)
{ {
if (p->async == EHCI_ASYNC_FINISHED) { if (p->async == EHCI_ASYNC_FINISHED) {
int state = ehci_get_state(p->queue->ehci, p->queue->async); EHCIQueue *q = p->queue;
int state = ehci_get_state(q->ehci, q->async);
/* This is a normal, but rare condition (cancel racing completion) */ /* This is a normal, but rare condition (cancel racing completion) */
fprintf(stderr, "EHCI: Warning packet completed but not processed\n"); fprintf(stderr, "EHCI: Warning packet completed but not processed\n");
ehci_state_executing(p->queue); ehci_state_executing(q);
ehci_state_writeback(p->queue); ehci_state_writeback(q);
ehci_set_state(p->queue->ehci, p->queue->async, state); ehci_set_state(q->ehci, q->async, state);
/* state_writeback recurses into us with async == EHCI_ASYNC_NONE!! */ /* state_writeback recurses into us with async == EHCI_ASYNC_NONE!! */
return; return;
} }