diff options
| author | Hans de Goede | 2013-11-16 11:37:41 +0100 |
|---|---|---|
| committer | Sarah Sharp | 2014-03-05 00:38:19 +0100 |
| commit | 6134041bef0aeb9cb7c8a8daf045b44513cd8396 (patch) | |
| tree | d5f11807b5992088d062df404d0bf13686b36b33 /drivers/usb/storage | |
| parent | uas: Drop fixed endpoint config handling (diff) | |
| download | kernel-qcow2-linux-6134041bef0aeb9cb7c8a8daf045b44513cd8396.tar.gz kernel-qcow2-linux-6134041bef0aeb9cb7c8a8daf045b44513cd8396.tar.xz kernel-qcow2-linux-6134041bef0aeb9cb7c8a8daf045b44513cd8396.zip | |
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>
Diffstat (limited to 'drivers/usb/storage')
| -rw-r--r-- | drivers/usb/storage/uas-detect.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h index 8de030a0a4a4..b8a02e12a8a2 100644 --- 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; } |