[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/9] xhci: check device is not NULL before callin
From: |
Liam Merwick |
Subject: |
[Qemu-devel] [PATCH v2 3/9] xhci: check device is not NULL before calling usb_ep_get() |
Date: |
Wed, 6 Feb 2019 13:36:50 +0000 |
Signed-off-by: Liam Merwick <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 0/9] Dealing with Null devices in usb_ep_get(), Liam Merwick, 2019/02/06
- [Qemu-devel] [PATCH v2 1/9] usb: rearrange usb_ep_get(), Liam Merwick, 2019/02/06
- [Qemu-devel] [PATCH v2 5/9] ohci: check device is not NULL before calling usb_ep_get(), Liam Merwick, 2019/02/06
- [Qemu-devel] [PATCH v2 2/9] xhci: add asserts to help with static code analysis, Liam Merwick, 2019/02/06
- [Qemu-devel] [PATCH v2 3/9] xhci: check device is not NULL before calling usb_ep_get(),
Liam Merwick <=
- [Qemu-devel] [PATCH v2 4/9] ehci: check device is not NULL before calling usb_ep_get(), Liam Merwick, 2019/02/06
- [Qemu-devel] [PATCH v2 8/9] usb: add device checks before redirector calls to usb_ep_get(), Liam Merwick, 2019/02/06
- [Qemu-devel] [PATCH v2 6/9] uhci: check device is not NULL before calling usb_ep_get(), Liam Merwick, 2019/02/06
- [Qemu-devel] [PATCH v2 7/9] usb: check device is not NULL before calling usb_ep_get(), Liam Merwick, 2019/02/06
- [Qemu-devel] [PATCH v2 9/9] usb: remove unnecessary NULL device check from usb_ep_get(), Liam Merwick, 2019/02/06
- Re: [Qemu-devel] [PATCH v2 0/9] Dealing with Null devices in usb_ep_get(), Gerd Hoffmann, 2019/02/08