Skip to content

Fixed a regression related to HID report descriptors. #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2025
Merged

Fixed a regression related to HID report descriptors. #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c90dbc1
Fix regression related to HID report descriptors.
fdesbiens Oct 2, 2025
274f35a
Modified to return proper return value.
fdesbiens Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions common/usbx_host_classes/src/ux_host_class_hid_report_descriptor_get.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,15 @@ UINT status;
/* Check for correct transfer and entire descriptor returned. */
if ((status == UX_SUCCESS) && (transfer_request -> ux_transfer_request_actual_length == length))
{

UINT analysis_failure;
/* Parse the report descriptor and build the report items. */
while (length)
{

/* Get one item from the report and analyze it. */
/* Make sure this descriptor has at least the minimum length. */
if(length < 3)
analysis_failure = _ux_host_class_hid_report_item_analyse(descriptor, &item);
if (analysis_failure)
{

/* Error trap. */
_ux_system_error_handler(UX_SYSTEM_LEVEL_THREAD, UX_SYSTEM_CONTEXT_CLASS, UX_DESCRIPTOR_CORRUPTED);

Expand All @@ -130,10 +130,7 @@ UINT status;
/* Return error status. */
status = (UX_DESCRIPTOR_CORRUPTED);
}

/* Get one item from the report and analyze it. */
_ux_host_class_hid_report_item_analyse(descriptor, &item);


/* Point the descriptor right after the item identifier. */
descriptor += item.ux_host_class_hid_item_report_format;

Expand Down
20 changes: 14 additions & 6 deletions common/usbx_host_classes/src/ux_host_class_hid_report_item_analyse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ UINT _ux_host_class_hid_report_item_analyse(UCHAR *descriptor, UX_HOST_CLASS_HI
{

UCHAR item_byte;

UINT result = UX_SUCCESS;

/* Get the first byte from the descriptor. */
item_byte = *descriptor;
Expand All @@ -89,11 +89,19 @@ UCHAR item_byte;
/* Set the type. */
item -> ux_host_class_hid_item_report_type = (item_byte >> 2) & 3;

/* Get its length (byte 1). */
item -> ux_host_class_hid_item_report_length = (USHORT) *(descriptor + 1);
/* Make sure descriptor has minimal length.*/
if (sizeof(descriptor) >= 3)
{
/* Get its length (byte 1). */
item -> ux_host_class_hid_item_report_length = (USHORT) *(descriptor + 1);

/* Then the tag (byte 2). */
item -> ux_host_class_hid_item_report_tag = *(descriptor + 2);
/* Then the tag (byte 2). */
item -> ux_host_class_hid_item_report_tag = *(descriptor + 2);
}
else
{
result = UX_DESCRIPTOR_CORRUPTED;
}
}
else
{
Expand Down Expand Up @@ -124,6 +132,6 @@ UCHAR item_byte;
}

/* Return successful completion. */
return(UX_SUCCESS);
return(result);
}