[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/12] uhci: Properly unmap packets on cancel / inva
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 05/12] uhci: Properly unmap packets on cancel / invalid pid |
Date: |
Mon, 8 Oct 2012 09:51:29 +0200 |
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 <address@hidden>
---
hw/usb/hcd-uhci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index cdc8bc3..70b76e5 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -236,6 +236,7 @@ static void uhci_async_cancel(UHCIAsync *async)
trace_usb_uhci_packet_cancel(async->queue->token, async->td, async->done);
if (!async->done)
usb_cancel_packet(&async->packet);
+ usb_packet_unmap(&async->packet, &async->sgl);
uhci_async_free(async);
}
@@ -879,6 +880,7 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr,
UHCI_TD *td,
default:
/* invalid pid : frame interrupted */
+ usb_packet_unmap(&async->packet, &async->sgl);
uhci_async_free(async);
s->status |= UHCI_STS_HCPERR;
uhci_update_irq(s);
--
1.7.12.1
- [Qemu-devel] [PATCH 00/12] RFC: usb: input pipelining support and other speedups, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 02/12] usb-redir: Add support for 32 bits bulk packet length, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 01/12] usb-redir: When a packet contains data on a stall, ignore the stall, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 07/12] uhci: Add support for input queuing, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 08/12] ehci: Get rid of packet tbytes field, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 03/12] usb-host-linux: Only enabling pipeling for output endpoints, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 04/12] usb: Add support for input pipelining, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 06/12] uhci: Move checks to continue queuing to uhci_fill_queue(), Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 05/12] uhci: Properly unmap packets on cancel / invalid pid,
Hans de Goede <=
- [Qemu-devel] [PATCH 12/12] ehci: Speed up the timer of raising int from the async schedule, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 09/12] ehci: Set int flag on a short input packet, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 10/12] ehci: Add support for input queuing, Hans de Goede, 2012/10/08
- [Qemu-devel] [PATCH 11/12] ehci: Improve latency of interrupt delivery and async schedule scanning, Hans de Goede, 2012/10/08