diff options
| author | Liam Merwick <liam.merwick@oracle.com> | 2019-02-06 13:36:51 +0000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-02-20 09:41:23 +0100 |
| commit | e94682f1febe3cc95cbe144137dd35eae39dc1e0 (patch) | |
| tree | 2313486d6508e0739e94520d40c1d78bc0cd86b6 | |
| parent | 7cb513aa34fe5639c71223f06b2b6c7934815317 (diff) | |
| download | qemu-e94682f1febe3cc95cbe144137dd35eae39dc1e0.zip qemu-e94682f1febe3cc95cbe144137dd35eae39dc1e0.tar.gz qemu-e94682f1febe3cc95cbe144137dd35eae39dc1e0.tar.bz2 | |
ehci: check device is not NULL before calling usb_ep_get()
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 <liam.merwick@oracle.com>
Message-id: 1549460216-25808-5-git-send-email-liam.merwick@oracle.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | hw/usb/hcd-ehci.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 9b132cb..62dab05 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, |