uas: Verify endpoint descriptors from uas_use_uas_driver()

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com>

diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h
index 8de030a0a4a4532716d95077cc1815449cbf517c..b8a02e12a8a2ae5af68a10443ba048486b66e679 100644 (file)
--- a/drivers/usb/storage/uas-detect.h
+++ b/drivers/usb/storage/uas-detect.h
@@ -70,13 +70,23 @@ static int uas_find_endpoints(struct usb_host_interface *alt,
 static int uas_use_uas_driver(struct usb_interface *intf,
                              const struct usb_device_id *id)
 {
+       struct usb_host_endpoint *eps[4] = { };
        struct usb_device *udev = interface_to_usbdev(intf);
        unsigned long flags = id->driver_info;
+       int r, alt;
 
        usb_stor_adjust_quirks(udev, &flags);
 
        if (flags & US_FL_IGNORE_UAS)
                return 0;
 
-       return uas_find_uas_alt_setting(intf) >= 0;
+       alt = uas_find_uas_alt_setting(intf);
+       if (alt < 0)
+               return 0;
+
+       r = uas_find_endpoints(&intf->altsetting[alt], eps);
+       if (r < 0)
+               return 0;
+
+       return 1;
 }