diff options
author | Hans de Goede <hdegoede@redhat.com> | 2013-08-03 10:37:48 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-12 15:24:27 -0400 |
commit | b4f17a488ae2e09bfcf95c0e0b4219c246f1116a (patch) | |
tree | 08e6bf805e5066d34a9b4d5176a79bbfce1b70ce /drivers/usb/core | |
parent | 3f0d1c67fa20d524fdcb4a7dcda19ed76c59be44 (diff) |
usb: config->desc.bLength may not exceed amount of data returned by the device
While reading the config parsing code I noticed this check is missing, without
this check config->desc.wTotalLength can end up with a value larger then the
dev->rawdescriptors length for the config, and when userspace then tries to
get the rawdescriptors bad things may happen.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r-- | drivers/usb/core/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index 7199adccf444..a6b2cabe7930 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c | |||
@@ -424,7 +424,8 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, | |||
424 | 424 | ||
425 | memcpy(&config->desc, buffer, USB_DT_CONFIG_SIZE); | 425 | memcpy(&config->desc, buffer, USB_DT_CONFIG_SIZE); |
426 | if (config->desc.bDescriptorType != USB_DT_CONFIG || | 426 | if (config->desc.bDescriptorType != USB_DT_CONFIG || |
427 | config->desc.bLength < USB_DT_CONFIG_SIZE) { | 427 | config->desc.bLength < USB_DT_CONFIG_SIZE || |
428 | config->desc.bLength > size) { | ||
428 | dev_err(ddev, "invalid descriptor for config index %d: " | 429 | dev_err(ddev, "invalid descriptor for config index %d: " |
429 | "type = 0x%X, length = %d\n", cfgidx, | 430 | "type = 0x%X, length = %d\n", cfgidx, |
430 | config->desc.bDescriptorType, config->desc.bLength); | 431 | config->desc.bDescriptorType, config->desc.bLength); |