feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'fix/tinyusb/string_desc' into 'master'

Browse Source 
tinyusb: Do not access string descriptor array out of boundaries

Closes IDF-6943

See merge request espressif/esp-idf!22497
This commit is contained in:
Jiang Jiang Jian
2023-02-28 22:46:59 +08:00
parent e8784f3641 2b5caf34b7
commit df13918c80
6 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/peripherals/usb/device/tusb_hid/main/idf_component.yml
View File

@@ -1,4 +1,4 @@
## IDF Component Manager Manifest File ## IDF Component Manager Manifest File
dependencies: dependencies:
espressif/esp_tinyusb: "^1" espressif/esp_tinyusb: "^1.1"
idf: "^5.0" idf: "^5.0"

3
examples/peripherals/usb/device/tusb_hid/main/tusb_hid_example_main.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Unlicense OR CC0-1.0 * SPDX-License-Identifier: Unlicense OR CC0-1.0
*/ */
@@ -167,6 +167,7 @@ void app_main(void)
const tinyusb_config_t tusb_cfg = { const tinyusb_config_t tusb_cfg = {
.device_descriptor = NULL, .device_descriptor = NULL,
.string_descriptor = hid_string_descriptor, .string_descriptor = hid_string_descriptor,
.string_descriptor_count = sizeof(hid_string_descriptor) / sizeof(hid_string_descriptor[0]),
.external_phy = false, .external_phy = false,
.configuration_descriptor = hid_configuration_descriptor, .configuration_descriptor = hid_configuration_descriptor,
}; };

2
examples/peripherals/usb/device/tusb_midi/main/idf_component.yml
View File

@@ -1,4 +1,4 @@
## IDF Component Manager Manifest File ## IDF Component Manager Manifest File
dependencies: dependencies:
espressif/esp_tinyusb: "^1" espressif/esp_tinyusb: "^1.1"
idf: "^5.0" idf: "^5.0"

3
examples/peripherals/usb/device/tusb_midi/main/tusb_midi_main.c
View File

@@ -3,7 +3,7 @@
* *
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
* *
* SPDX-FileContributor: 2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileContributor: 2022-2023 Espressif Systems (Shanghai) CO LTD
*/ */
#include <stdlib.h> #include <stdlib.h>
@@ -137,6 +137,7 @@ void app_main(void)
tinyusb_config_t const tusb_cfg = { tinyusb_config_t const tusb_cfg = {
.device_descriptor = NULL, // If device_descriptor is NULL, tinyusb_driver_install() will use Kconfig .device_descriptor = NULL, // If device_descriptor is NULL, tinyusb_driver_install() will use Kconfig
.string_descriptor = s_str_desc, .string_descriptor = s_str_desc,
.string_descriptor_count = sizeof(s_str_desc) / sizeof(s_str_desc[0]),
.external_phy = false, .external_phy = false,
.configuration_descriptor = s_midi_cfg_desc, .configuration_descriptor = s_midi_cfg_desc,
}; };

2
examples/peripherals/usb/device/tusb_msc/main/idf_component.yml
View File

@@ -1,4 +1,4 @@
## IDF Component Manager Manifest File ## IDF Component Manager Manifest File
dependencies: dependencies:
espressif/esp_tinyusb: "^1" espressif/esp_tinyusb: "^1.1"
idf: "^5.0" idf: "^5.0"

1
examples/peripherals/usb/device/tusb_msc/main/tusb_msc_main.c
View File

@@ -482,6 +482,7 @@ void app_main(void)
const tinyusb_config_t tusb_cfg = { const tinyusb_config_t tusb_cfg = {
.device_descriptor = &descriptor_config, .device_descriptor = &descriptor_config,
.string_descriptor = string_desc_arr, .string_descriptor = string_desc_arr,
.string_descriptor_count = sizeof(string_desc_arr) / sizeof(string_desc_arr[0]),
.external_phy = false, .external_phy = false,
.configuration_descriptor = desc_configuration, .configuration_descriptor = desc_configuration,
.self_powered = true, .self_powered = true,