diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-08-30 13:05:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-08-30 13:05:53 -0700 |
| commit | eac1682a3cc40b8236f759265b83669ae14b5add (patch) | |
| tree | 647201586a4e7d946eb6574806122ee631f3306f | |
| parent | 6c3f01437247e8b8275c130eb004eb1508177cbd (diff) | |
| parent | 4470e551f6752f1d0541b5a4aab911f720767d53 (diff) | |
Merge "USB: core: only clean up what we allocated"
| -rw-r--r-- | drivers/usb/core/config.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index dbc9b1a41d67..d551194a6ad6 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -734,18 +734,21 @@ void usb_destroy_configuration(struct usb_device *dev) return; if (dev->rawdescriptors) { - for (i = 0; i < dev->descriptor.bNumConfigurations; i++) + for (i = 0; i < dev->descriptor.bNumConfigurations && + i < USB_MAXCONFIG; i++) kfree(dev->rawdescriptors[i]); kfree(dev->rawdescriptors); dev->rawdescriptors = NULL; } - for (c = 0; c < dev->descriptor.bNumConfigurations; c++) { + for (c = 0; c < dev->descriptor.bNumConfigurations && + c < USB_MAXCONFIG; c++) { struct usb_host_config *cf = &dev->config[c]; kfree(cf->string); - for (i = 0; i < cf->desc.bNumInterfaces; i++) { + for (i = 0; i < cf->desc.bNumInterfaces && + i < USB_MAXINTERFACES; i++) { if (cf->intf_cache[i]) kref_put(&cf->intf_cache[i]->ref, usb_release_interface_cache); |