From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:58624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1grNOL-00057b-Gr for qemu-devel@nongnu.org; Wed, 06 Feb 2019 08:37:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1grNOI-0003nt-6P for qemu-devel@nongnu.org; Wed, 06 Feb 2019 08:37:27 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:36368) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1grNOD-0003mm-Kn for qemu-devel@nongnu.org; Wed, 06 Feb 2019 08:37:23 -0500 From: Liam Merwick Date: Wed, 6 Feb 2019 13:36:50 +0000 Message-Id: <1549460216-25808-4-git-send-email-liam.merwick@oracle.com> In-Reply-To: <1549460216-25808-1-git-send-email-liam.merwick@oracle.com> References: <1549460216-25808-1-git-send-email-liam.merwick@oracle.com> Subject: [Qemu-devel] [PATCH v2 3/9] xhci: check device is not NULL before calling usb_ep_get() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kraxel@redhat.com, qemu-devel@nongnu.org Cc: liam.merwick@oracle.com, darren.kenny@oracle.com Signed-off-by: Liam Merwick --- hw/usb/hcd-xhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 99b83aaa9ed5..ec28bee31963 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; - token = (epctx->epid & 1) ? USB_TOKEN_IN : USB_TOKEN_OUT; - if (!uport) { + if (!uport || !uport->dev) { return NULL; } + token = (epctx->epid & 1) ? USB_TOKEN_IN : USB_TOKEN_OUT; return usb_ep_get(uport->dev, token, epctx->epid >> 1); } -- 1.8.3.1