[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/9] ehci: check device is not NULL before calling us
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/9] ehci: check device is not NULL before calling usb_ep_get() |
Date: |
Wed, 20 Feb 2019 12:13:41 +0100 |
From: Liam Merwick <address@hidden>
In ehci_process_itd(), the call to ehci_find_device() can return NULL
if it doesn't find a device matching 'devaddr' so explicitly check
the return value before passing it to usb_ep_get().
Signed-off-by: Liam Merwick <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-ehci.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 9b132cb0d3..62dab0592f 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -1439,9 +1439,12 @@ static int ehci_process_itd(EHCIState *ehci,
qemu_sglist_add(&ehci->isgl, ptr1 + off, len);
}
- pid = dir ? USB_TOKEN_IN : USB_TOKEN_OUT;
-
dev = ehci_find_device(ehci, devaddr);
+ if (dev == NULL) {
+ ehci_trace_guest_bug(ehci, "no device found");
+ return -1;
+ }
+ pid = dir ? USB_TOKEN_IN : USB_TOKEN_OUT;
ep = usb_ep_get(dev, pid, endp);
if (ep && ep->type == USB_ENDPOINT_XFER_ISOC) {
usb_packet_setup(&ehci->ipacket, pid, ep, 0, addr, false,
--
2.9.3
- [Qemu-devel] [PULL 3/9] xhci: check device is not NULL before calling usb_ep_get(), (continued)
- [Qemu-devel] [PULL 3/9] xhci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 7/9] usb: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 9/9] usb: remove unnecessary NULL device check from usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 1/9] usb: rearrange usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 5/9] ohci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 2/9] xhci: add asserts to help with static code analysis, Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 6/9] uhci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 8/9] usb: add device checks before redirector calls to usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 4/9] ehci: check device is not NULL before calling usb_ep_get(),
Gerd Hoffmann <=
- Re: [Qemu-devel] [PULL 0/9] Usb 20190220 patches, Peter Maydell, 2019/02/21