[Qemu-devel] [PULL 3/9] xhci: check device is not NULL before calling usb_ep_get()

[Gerd Hoffmann]

From: Liam Merwick <liam.merw...@oracle.com>

Signed-off-by: Liam Merwick <liam.merw...@oracle.com>
Message-id: 1549460216-25808-4-git-send-email-liam.merw...@oracle.com
Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
---
 hw/usb/hcd-xhci.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 99b83aaa9e..ec28bee319 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -3276,10 +3276,10 @@ static USBEndpoint *xhci_epid_to_usbep(XHCIEPContext 
*epctx)
         return NULL;
     }
     uport = epctx->xhci->slots[epctx->slotid - 1].uport;
+    if (!uport || !uport->dev) {
+        return NULL;
+    }
     token = (epctx->epid & 1) ? USB_TOKEN_IN : USB_TOKEN_OUT;
-    if (!uport) {
-        return NULL;
-    }
     return usb_ep_get(uport->dev, token, epctx->epid >> 1);
 }
 
-- 
2.9.3