[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 8/9] usb: add device checks before redirector cal
From: |
Liam Merwick |
Subject: |
[Qemu-devel] [PATCH v2 8/9] usb: add device checks before redirector calls to usb_ep_get() |
Date: |
Wed, 6 Feb 2019 13:36:55 +0000 |
Add an assert and an explicit check before the two callers to
usb_ep_get() in the USB redirector code to ensure the device
passed in is not NULL.
Signed-off-by: Liam Merwick <address@hidden>
---
hw/usb/redirect.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 18a42d19380e..7cb6b120d4f0 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -1728,6 +1728,7 @@ static void usbredir_ep_info(void *priv,
USBRedirDevice *dev = priv;
int i;
+ assert(dev != NULL);
for (i = 0; i < MAX_ENDPOINTS; i++) {
dev->endpoint[i].type = ep_info->type[i];
dev->endpoint[i].interval = ep_info->interval[i];
@@ -2125,7 +2126,7 @@ static int usbredir_post_load(void *priv, int version_id)
{
USBRedirDevice *dev = priv;
- if (dev->parser == NULL) {
+ if (dev == NULL || dev->parser == NULL) {
return 0;
}
--
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, 2019/02/06
- [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 <=
- [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