Author: hselasky
Date: Sat Jun 8 09:34:02 2019
New Revision: 348797
URL: https://svnweb.freebsd.org/changeset/base/348797
Log:
Fix for reading the configuration descriptor in libusb. Catch invalid
configuration descriptor reads early on to avoid issues with devices
that don't check for a valid USB configuration read request.
Submitted by: takahiro.kuros...@gmail.com
PR: 238412
MFC after: 3 days
Modified:
head/lib/libusb/libusb20.c
Modified: head/lib/libusb/libusb20.c
==============================================================================
--- head/lib/libusb/libusb20.c Sat Jun 8 08:25:43 2019 (r348796)
+++ head/lib/libusb/libusb20.c Sat Jun 8 09:34:02 2019 (r348797)
@@ -955,6 +955,14 @@ libusb20_dev_alloc_config(struct libusb20_device *pdev
uint8_t do_close;
int error;
+ /*
+ * Catch invalid configuration descriptor reads early on to
+ * avoid issues with devices that don't check for a valid USB
+ * configuration read request.
+ */
+ if (configIndex >= pdev->ddesc.bNumConfigurations)
+ return (NULL);
+
if (!pdev->is_opened) {
error = libusb20_dev_open(pdev, 0);
if (error) {
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
