Salastil/OpenRGB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HID LampArray: stop on a failed report descriptor read

Browse Source 
hid_get_report_descriptor returns -1 on failure and the length was
stored unsigned, so the descriptor walk ran past the end of the stack
buffer. Windows reconstructs the descriptor from preparsed data and can
fail where Linux returns the kernel's copy. A failed read now leaves the
device with no lamps, the same as a descriptor with missing reports.
This commit is contained in:
Ken Sanislo
2026-09-03 11:11:36 -05:00
committed by Adam Honse
parent 657cc0d05d
commit bf2a0fb8f1
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/HIDLampArrayController/HIDLampArrayController.cpp
+13 -2
View File
@@ -31,7 +31,7 @@ HIDLampArrayController::HIDLampArrayController(hid_device *dev_handle, const cha
unsigned int pos = 0;
unsigned char report_descriptor[HID_API_MAX_REPORT_DESCRIPTOR_SIZE];
unsigned char report_id = 0;
unsigned int size = hid_get_report_descriptor(dev, report_descriptor, sizeof(report_descriptor));
int size = hid_get_report_descriptor(dev, report_descriptor, sizeof(report_descriptor));
unsigned int usage = 0;
unsigned char usage_page = 0;
@@ -40,7 +40,18 @@ HIDLampArrayController::HIDLampArrayController(hid_device *dev_handle, const cha
\*-----------------------------------------------------*/
std::unordered_map<unsigned int, unsigned int> usage_to_report_id;
while(pos < size)
/*-----------------------------------------------------*\
| A failed descriptor read returns -1; treated as a |
| length it walks off the end of the buffer. |
\*-----------------------------------------------------*/
if(size < 0)
{
LampArray.LampCount = 0;
LampArray.LampArrayKind = HID_LAMPARRAY_KIND_UNDEFINED;
return;
}
while(pos < (unsigned int)size)
{
get_hid_item_size(report_descriptor, size, pos, &data_len, &key_size);