[ros-diffs] [reactos] 06/09: [USBPORT] Correctly find interface descriptor in USBPORT_ParseConfigurationDescriptor

[Thomas Faber]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=36c1cb09106eab6cebab2…

commit 36c1cb09106eab6cebab2e6722c1907ca12bfa19
Author:     Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Wed Mar 6 09:22:55 2019 +0100
Commit:     Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Mon Mar 11 08:53:53 2019 +0100

    [USBPORT] Correctly find interface descriptor in USBPORT_ParseConfigurationDescriptor
    
    There can be other descriptors between the config descriptor and the
    first interface descriptor, so we specifically need to check for
    the interface descriptor type and skip anything before that.
    We also need to guard against bLength == 0, which would cause an
    infinite loop, instead of doing a second bDescriptorType check.
---
 drivers/usb/usbport/device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/usbport/device.c b/drivers/usb/usbport/device.c
index b28d9ef015..5662a6141a 100644
--- a/drivers/usb/usbport/device.c
+++ b/drivers/usb/usbport/device.c
@@ -201,7 +201,7 @@ USBPORT_ParseConfigurationDescriptor(IN PUSB_CONFIGURATION_DESCRIPTOR
ConfigDesc
         *OutAlternate = 0;
 
     for (TmpDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)((ULONG_PTR)ConfigDescriptor +
ConfigDescriptor->bLength);
-         TmpDescriptor->bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE
&& TmpDescriptor->bDescriptorType > 0;
+         TmpDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE &&
TmpDescriptor->bLength > 0;
          TmpDescriptor = (PUSB_CONFIGURATION_DESCRIPTOR)((ULONG_PTR)TmpDescriptor +
TmpDescriptor->bLength))
     ;