espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_hidh_integrity_check_bug_v5.0' into 'release/v5.0'

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

See merge request espressif/esp-idf!32723
This commit is contained in:
Wang Meng Yang
2024-08-15 12:13:37 +08:00
parent fb8bef8ce3 4d4d4b8abc
commit 06dba23ce0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -492,7 +492,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)
{ {
@@ -611,7 +611,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;