[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 2/9] xhci: add asserts to help with static code analy
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 2/9] xhci: add asserts to help with static code analysis |
Date: |
Wed, 20 Feb 2019 12:13:39 +0100 |
From: Liam Merwick <address@hidden>
Most callers of xhci_port_update() and xhci_wakeup() pass in a pointer
to an array entry and can never be NULL but add two defensive asserts
to protect against future changes (e.g. adding a new port speed, etc.)
adding a path through xhci_lookup_port() that could result in the
return of a NULL XHCIPort.
Signed-off-by: Liam Merwick <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-xhci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 19c64f7ff4..99b83aaa9e 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -2607,6 +2607,7 @@ static void xhci_port_update(XHCIPort *port, int
is_detach)
{
uint32_t pls = PLS_RX_DETECT;
+ assert(port);
port->portsc = PORTSC_PP;
if (!is_detach && xhci_port_have_device(port)) {
port->portsc |= PORTSC_CCS;
@@ -3215,6 +3216,7 @@ static void xhci_wakeup(USBPort *usbport)
XHCIState *xhci = usbport->opaque;
XHCIPort *port = xhci_lookup_port(xhci, usbport);
+ assert(port);
if (get_field(port->portsc, PORTSC_PLS) != PLS_U3) {
return;
}
--
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, 2019/02/20
- [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 <=
- [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
- Re: [Qemu-devel] [PULL 0/9] Usb 20190220 patches, Peter Maydell, 2019/02/21