Skip to content

Commit 974bba5

Browse files
Epicuriusgregkh
authored andcommitted
usb: config: fix iteration issue in 'usb_get_bos_descriptor()'
The BOS descriptor defines a root descriptor and is the base descriptor for accessing a family of related descriptors. Function 'usb_get_bos_descriptor()' encounters an iteration issue when skipping the 'USB_DT_DEVICE_CAPABILITY' descriptor type. This results in the same descriptor being read repeatedly. To address this issue, a 'goto' statement is introduced to ensure that the pointer and the amount read is updated correctly. This ensures that the function iterates to the next descriptor instead of reading the same descriptor repeatedly. Cc: stable@vger.kernel.org Fixes: 3dd550a ("USB: usbcore: Fix slab-out-of-bounds bug during device reset") Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com> Acked-by: Mathias Nyman <mathias.nyman@linux.intel.com> Reviewed-by: Alan Stern <stern@rowland.harvard.edu> Link: https://lore.kernel.org/r/20231115121325.471454-1-niklas.neronin@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 791cd7a commit 974bba5

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/usb/core/config.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,7 @@ int usb_get_bos_descriptor(struct usb_device *dev)
10471047

10481048
if (cap->bDescriptorType != USB_DT_DEVICE_CAPABILITY) {
10491049
dev_notice(ddev, "descriptor type invalid, skip\n");
1050-
continue;
1050+
goto skip_to_next_descriptor;
10511051
}
10521052

10531053
switch (cap_type) {
@@ -1078,6 +1078,7 @@ int usb_get_bos_descriptor(struct usb_device *dev)
10781078
break;
10791079
}
10801080

1081+
skip_to_next_descriptor:
10811082
total_len -= length;
10821083
buffer += length;
10831084
}

0 commit comments

Comments
 (0)