From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>,
Liam Merwick <liam.merwick@oracle.com>
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 [thread overview]
Message-ID: <20190220111346.13669-4-kraxel@redhat.com> (raw)
In-Reply-To: <20190220111346.13669-1-kraxel@redhat.com>
From: Liam Merwick <liam.merwick@oracle.com>
Signed-off-by: Liam Merwick <liam.merwick@oracle.com>
Message-id: 1549460216-25808-4-git-send-email-liam.merwick@oracle.com
Signed-off-by: Gerd Hoffmann <kraxel@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
next prev parent reply other threads:[~2019-02-20 11:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 11:13 [Qemu-devel] [PULL 0/9] Usb 20190220 patches Gerd Hoffmann
2019-02-20 11:13 ` [Qemu-devel] [PULL 1/9] usb: rearrange usb_ep_get() Gerd Hoffmann
2019-02-20 11:13 ` [Qemu-devel] [PULL 2/9] xhci: add asserts to help with static code analysis Gerd Hoffmann
2019-02-20 11:13 ` Gerd Hoffmann [this message]
2019-02-20 11:13 ` [Qemu-devel] [PULL 4/9] ehci: check device is not NULL before calling usb_ep_get() Gerd Hoffmann
2019-02-20 11:13 ` [Qemu-devel] [PULL 5/9] ohci: " Gerd Hoffmann
2019-02-20 11:13 ` [Qemu-devel] [PULL 6/9] uhci: " Gerd Hoffmann
2019-02-20 11:13 ` [Qemu-devel] [PULL 7/9] usb: " Gerd Hoffmann
2019-02-20 11:13 ` [Qemu-devel] [PULL 8/9] usb: add device checks before redirector calls to usb_ep_get() Gerd Hoffmann
2019-02-20 11:24 ` Yuval Shaia
2019-02-22 0:17 ` Liam Merwick
2019-02-20 11:13 ` [Qemu-devel] [PULL 9/9] usb: remove unnecessary NULL device check from usb_ep_get() Gerd Hoffmann
2019-02-21 13:09 ` [Qemu-devel] [PULL 0/9] Usb 20190220 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190220111346.13669-4-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=liam.merwick@oracle.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.