evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "USB: core: only clean up what we allocated"

Browse source 
This reverts commit 33f11e4812d25d0709740fc0a52f9658d6f0ac61.

Alan wrote a better fix for this:
USB: core: prevent malicious bNumInterfaces overflow

Change-Id: I3410378b27479d0db51fed51c82806045274ecf8
Cc: Andrey Konovalov <andreyknvl@google.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2017-12-13 11:59:39 +01:00 • committed by Timi
parent dfce62a901
commit a92a3ba12c
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/usb/core/config.c
View file

@ -739,21 +739,18 @@ void usb_destroy_configuration(struct usb_device *dev)
return; return;
if (dev->rawdescriptors) { if (dev->rawdescriptors) {
for (i = 0; i < dev->descriptor.bNumConfigurations && for (i = 0; i < dev->descriptor.bNumConfigurations; i++)
i < USB_MAXCONFIG; i++)
kfree(dev->rawdescriptors[i]); kfree(dev->rawdescriptors[i]);
kfree(dev->rawdescriptors); kfree(dev->rawdescriptors);
dev->rawdescriptors = NULL; dev->rawdescriptors = NULL;
} }
for (c = 0; c < dev->descriptor.bNumConfigurations && for (c = 0; c < dev->descriptor.bNumConfigurations; c++) {
c < USB_MAXCONFIG; c++) {
struct usb_host_config *cf = &dev->config[c]; struct usb_host_config *cf = &dev->config[c];
kfree(cf->string); kfree(cf->string);
for (i = 0; i < cf->desc.bNumInterfaces && for (i = 0; i < cf->desc.bNumInterfaces; i++) {
i < USB_MAXINTERFACES; i++) {
if (cf->intf_cache[i]) if (cf->intf_cache[i])
kref_put(&cf->intf_cache[i]->ref, kref_put(&cf->intf_cache[i]->ref,
usb_release_interface_cache); usb_release_interface_cache);