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

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>

diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 126987c..668d797 100644 (file)
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -734,21 +734,18 @@ void usb_destroy_configuration(struct usb_device *dev)
                return;
 
        if (dev->rawdescriptors) {
-               for (i = 0; i < dev->descriptor.bNumConfigurations &&
-                               i < USB_MAXCONFIG; i++)
+               for (i = 0; i < dev->descriptor.bNumConfigurations; i++)
                        kfree(dev->rawdescriptors[i]);
 
                kfree(dev->rawdescriptors);
                dev->rawdescriptors = NULL;
        }
 
-       for (c = 0; c < dev->descriptor.bNumConfigurations &&
-                       c < USB_MAXCONFIG; c++) {
+       for (c = 0; c < dev->descriptor.bNumConfigurations; c++) {
                struct usb_host_config *cf = &dev->config[c];
 
                kfree(cf->string);
-               for (i = 0; i < cf->desc.bNumInterfaces &&
-                               i < USB_MAXINTERFACES; i++) {
+               for (i = 0; i < cf->desc.bNumInterfaces; i++) {
                        if (cf->intf_cache[i])
                                kref_put(&cf->intf_cache[i]->ref,
                                          usb_release_interface_cache);