[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/9] xhci: check device is not NULL before calling us
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 3/9] xhci: check device is not NULL before calling usb_ep_get() |
Date: |
Wed, 20 Feb 2019 12:13:40 +0100 |
From: Liam Merwick <address@hidden>
Signed-off-by: Liam Merwick <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PULL 0/9] Usb 20190220 patches, Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 3/9] xhci: check device is not NULL before calling usb_ep_get(),
Gerd Hoffmann <=
- [Qemu-devel] [PULL 7/9] usb: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 9/9] usb: remove unnecessary NULL device check from usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 1/9] usb: rearrange usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 5/9] ohci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 2/9] xhci: add asserts to help with static code analysis, Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 6/9] uhci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 8/9] usb: add device checks before redirector calls to usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 4/9] ehci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20