diff options
| author | Liam Merwick <liam.merwick@oracle.com> | 2019-02-06 13:36:55 +0000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2019-02-20 09:41:23 +0100 |
| commit | 4fc12aa1fcc212e47a695b4cd34e75f3dab7d7d7 (patch) | |
| tree | 4586b3f021e67dc9e592794d610f1bad7a719b89 /hw/usb | |
| parent | e87fd1e6e547a80b3e403e882b829d2750e24e44 (diff) | |
| download | qemu-4fc12aa1fcc212e47a695b4cd34e75f3dab7d7d7.zip qemu-4fc12aa1fcc212e47a695b4cd34e75f3dab7d7d7.tar.gz qemu-4fc12aa1fcc212e47a695b4cd34e75f3dab7d7d7.tar.bz2 | |
usb: add device checks before redirector calls to usb_ep_get()
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 <liam.merwick@oracle.com>
Message-id: 1549460216-25808-9-git-send-email-liam.merwick@oracle.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/redirect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 18a42d1..7cb6b12 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; } |