Commit e94682f1 authored by Liam Merwick's avatar Liam Merwick Committed by Gerd Hoffmann
Browse files

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: default avatarLiam Merwick <liam.merwick@oracle.com>
Message-id: 1549460216-25808-5-git-send-email-liam.merwick@oracle.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 7cb513aa

hw/usb/hcd-ehci.c

+5 −2
Original line number Diff line number Diff line
@@ -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,