diff options
author | Prasad J Pandit <pjp@fedoraproject.org> | 2016-02-11 16:31:20 +0530 |
---|---|---|
committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-02-23 10:38:00 +0100 |
commit | 80eecda8e5d09c442c24307f340840a5b70ea3b9 (patch) | |
tree | ec75df889a51c9aca75c30ec15a46f9934670f51 /hw | |
parent | 8eb779e4223a18db9838a49ece1bc72cfdfb7761 (diff) |
usb: check USB configuration descriptor object
When processing remote NDIS control message packets, the USB Net
device emulator checks to see if the USB configuration descriptor
object is of RNDIS type(2). But it does not check if it is null,
which leads to a null dereference error. Add check to avoid it.
Reported-by: Qinghao Tang <luodalongde@gmail.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-id: 1455188480-14688-1-git-send-email-ppandit@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/usb/dev-network.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c index 985a6298bf..5dc45383d3 100644 --- a/hw/usb/dev-network.c +++ b/hw/usb/dev-network.c @@ -654,7 +654,8 @@ typedef struct USBNetState { static int is_rndis(USBNetState *s) { - return s->dev.config->bConfigurationValue == DEV_RNDIS_CONFIG_VALUE; + return s->dev.config ? + s->dev.config->bConfigurationValue == DEV_RNDIS_CONFIG_VALUE : 0; } static int ndis_query(USBNetState *s, uint32_t oid, |