usb: deal with broken config descriptors

Change usb_get_configuration() so that it is more tolerant to devices
with bad configuration descriptors (it'll make it ignore
configurations that fail to load).

Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c
index 4c9e63e665b6..bfb3731d42db 100644
--- a/drivers/usb/core/config.c
+++ b/drivers/usb/core/config.c
@@ -475,7 +475,9 @@ int usb_get_configuration(struct usb_device *dev)
                 if (result < 0) {
                         dev_err(ddev, "unable to read config index %d "
                             "descriptor/%s\n", cfgno, "start");
-                        goto err;
+                        dev_err(ddev, "chopping to %d config(s)\n", cfgno);
+                        dev->descriptor.bNumConfigurations = cfgno;
+                        break;
                 } else if (result < 4) {
                         dev_err(ddev, "config index %d descriptor too short "
                             "(expected %i, got %i)\n", cfgno,