diff options
| author | Andrey Konovalov <andreyknvl@google.com> | 2017-12-11 22:48:41 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2018-11-29 15:22:37 +0100 |
| commit | 108e7ab45786a56938e996a8c4a79b6c63612968 (patch) | |
| tree | c75b21d7a12a4de908ff1de0f37c3490b3ac0f3e /drivers | |
| parent | 2b6e2f96190f607e7887d7a7bdc93c21d91b6700 (diff) | |
USB: core: only clean up what we allocated
When cleaning up the configurations, make sure we only free the number
of configurations and interfaces that we could have allocated.
Change-Id: I07a2ddd088264030544284ad9680cd6d2b538d21
Reported-by: Andrey Konovalov <andreyknvl@google.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 32fd87b3bbf5f7a045546401dfe2894dbbf4d8c3
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Srinivasa Rao Kuppala <srkupp@codeaurora.org>
Signed-off-by: Dheeraj Kumar Chaudhary <dheech@codeaurora.org>
Signed-off-by: Richard JK <rjk@codeaurora.org>
Diffstat (limited to 'drivers')
| -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 a4fa0a35d..3ea574200 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -709,18 +709,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); |