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>
This commit is contained in:
parent
7cb513aa34
commit
e94682f1fe
|
@ -1439,9 +1439,12 @@ static int ehci_process_itd(EHCIState *ehci,
|
||||||
qemu_sglist_add(&ehci->isgl, ptr1 + off, len);
|
qemu_sglist_add(&ehci->isgl, ptr1 + off, len);
|
||||||
}
|
}
|
||||||
|
|
||||||
pid = dir ? USB_TOKEN_IN : USB_TOKEN_OUT;
|
|
||||||
|
|
||||||
dev = ehci_find_device(ehci, devaddr);
|
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);
|
ep = usb_ep_get(dev, pid, endp);
|
||||||
if (ep && ep->type == USB_ENDPOINT_XFER_ISOC) {
|
if (ep && ep->type == USB_ENDPOINT_XFER_ISOC) {
|
||||||
usb_packet_setup(&ehci->ipacket, pid, ep, 0, addr, false,
|
usb_packet_setup(&ehci->ipacket, pid, ep, 0, addr, false,
|
||||||
|
|
Loading…
Reference in a new issue