alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_hidh_integrity_check_bug' into 'master'

Browse Source 
fix(esp_hid): Loose the check of input report length to be more compatible

Closes IDFGH-13344

See merge request espressif/esp-idf!32663
This commit is contained in:
Wang Meng Yang 2024-08-09 15:27:34 +08:00
commit b95a9c5c63
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/esp_hid/src/esp_hidh.c
View File

@ -536,7 +536,7 @@ esp_err_t esp_hidh_dev_report_maps_get(esp_hidh_dev_t *dev, size_t *num_maps, es
* */ * */
/** /**
* `lock_devices()` only protect the devices list, this mutex protect the single deivce instance. * `lock_devices()` only protect the devices list, this mutex protect the single device instance.
*/ */
inline void esp_hidh_dev_lock(esp_hidh_dev_t *dev) inline void esp_hidh_dev_lock(esp_hidh_dev_t *dev)
{ {
@ -655,7 +655,12 @@ esp_hidh_dev_report_t *esp_hidh_dev_get_input_report_by_proto_and_data(esp_hidh_
} }
r = dev->reports; r = dev->reports;
while (r) { while (r) {
if (r->value_len == len - 1 && r->report_id == *data && (r->report_type & ESP_HID_REPORT_TYPE_INPUT) && /**
* @note For some HID device, the input report length may exceed the length which is declared in HID
* descriptor, like Logitech K380 keyboard. So loose the check condition from `r->value_len == len - 1` to
* `r->value_len <= len - 1`.
*/
if (r->value_len <= len - 1 && r->report_id == *data && (r->report_type & ESP_HID_REPORT_TYPE_INPUT) &&
r->protocol_mode == protocol_mode) { r->protocol_mode == protocol_mode) {
*has_report_id = true; *has_report_id = true;
break; break;