diff options
| author | Corey Minyard <cminyard@mvista.com> | 2017-11-02 11:19:15 -0500 |
|---|---|---|
| committer | Corey Minyard <cminyard@mvista.com> | 2017-11-02 11:19:15 -0500 |
| commit | 6297fabd93f93182245383ba7de56bef829a796b (patch) | |
| tree | 804f5d28ada61b402d56281c9a047308d26347f4 /drivers/usb/core/config.c | |
| parent | d7e17fe4f7a7d961cc4375c7d868bd353a039bc7 (diff) | |
| parent | ece1996a21eeb344b49200e627c6660111009c10 (diff) | |
| download | kernel_replicant_linux-6297fabd93f93182245383ba7de56bef829a796b.tar.gz kernel_replicant_linux-6297fabd93f93182245383ba7de56bef829a796b.tar.bz2 kernel_replicant_linux-6297fabd93f93182245383ba7de56bef829a796b.zip | |
Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux into for-next
The IPMI SI driver was split into different pieces, merge the module
tree to accountfor that.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Diffstat (limited to 'drivers/usb/core/config.c')
| -rw-r--r-- | drivers/usb/core/config.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index 4be52c602e9b..68b54bd88d1e 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -643,15 +643,23 @@ static int usb_parse_configuration(struct usb_device *dev, int cfgidx, } else if (header->bDescriptorType == USB_DT_INTERFACE_ASSOCIATION) { + struct usb_interface_assoc_descriptor *d; + + d = (struct usb_interface_assoc_descriptor *)header; + if (d->bLength < USB_DT_INTERFACE_ASSOCIATION_SIZE) { + dev_warn(ddev, + "config %d has an invalid interface association descriptor of length %d, skipping\n", + cfgno, d->bLength); + continue; + } + if (iad_num == USB_MAXIADS) { dev_warn(ddev, "found more Interface " "Association Descriptors " "than allocated for in " "configuration %d\n", cfgno); } else { - config->intf_assoc[iad_num] = - (struct usb_interface_assoc_descriptor - *)header; + config->intf_assoc[iad_num] = d; iad_num++; } @@ -852,7 +860,7 @@ int usb_get_configuration(struct usb_device *dev) } if (dev->quirks & USB_QUIRK_DELAY_INIT) - msleep(100); + msleep(200); result = usb_get_descriptor(dev, USB_DT_CONFIG, cfgno, bigbuffer, length); |