projects
/
users
/
dwmw2
/
qemu.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ce4fc98
)
ehci: Fix NULL ptr deref when unplugging an USB dev with an iso stream active
author
Hans de Goede <hdegoede@redhat.com>
Tue, 28 Aug 2012 09:50:26 +0000
(11:50 +0200)
committer
Michael Roth <mdroth@linux.vnet.ibm.com>
Wed, 5 Sep 2012 15:30:38 +0000
(10:30 -0500)
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
(cherry picked from commit
7ce86aa1aafaa65e7d3e572873bdf37bdb896f49
)
Conflicts:
hw/usb/hcd-ehci.c
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
hw/usb/hcd-ehci.c
patch
|
blob
|
history
diff --git
a/hw/usb/hcd-ehci.c
b/hw/usb/hcd-ehci.c
index 41c9d84354f7d2c0e8656d46b79d136aff8acad5..a511b4e83f0b841f1e7d22e27a82f8935c4346ca 100644
(file)
--- a/
hw/usb/hcd-ehci.c
+++ b/
hw/usb/hcd-ehci.c
@@
-1465,7
+1465,7
@@
static int ehci_process_itd(EHCIState *ehci,
dev = ehci_find_device(ehci, devaddr);
ep = usb_ep_get(dev, pid, endp);
- if (ep->type == USB_ENDPOINT_XFER_ISOC) {
+ if (ep
&& ep
->type == USB_ENDPOINT_XFER_ISOC) {
usb_packet_setup(&ehci->ipacket, pid, ep);
usb_packet_map(&ehci->ipacket, &ehci->isgl);
ret = usb_handle_packet(dev, &ehci->ipacket);