espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(host/usb): Fixed deadlock that prevented closing devices from high priority tasks

Browse Source 
If in usb_host_interface_release() the underlying pipe was halted while having an URB in-flight,
usb_host_client_handle_events() may not have had a chance to process the URB yet.
Check if there are any pending URBs on the pipe before attempting to free it.

Closes https://github.com/espressif/esp-idf/issues/17707
This commit is contained in:
Tomas Rezucha
2026-02-03 11:00:06 +01:00
parent 96044a4442
commit 85049c9338
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/usb/usb_host.c
+13 -1
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2015-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -1480,6 +1480,18 @@ esp_err_t usb_host_interface_release(usb_host_client_handle_t client_hdl, usb_de
// Take mux lock. This protects the client being released or other clients from claiming interfaces
xSemaphoreTake(p_host_lib_obj->constant.mux_lock, portMAX_DELAY);
// In case the underlying pipe was halted while having an URB in-flight,
// usb_host_client_handle_events() may not have had a chance to process the URB yet,
// in case it is handled from low priority task and we are calling this function from a high priority task.
HOST_ENTER_CRITICAL();
const bool pending_ep = !TAILQ_EMPTY(&client_obj->dynamic.pending_ep_tailq);
HOST_EXIT_CRITICAL();
if (pending_ep) {
// We wait 10 FreeRTOS ticks to give the class driver task chance to run and process the URB.
vTaskDelay(10);
}
esp_err_t ret = interface_release(client_obj, dev_hdl, bInterfaceNumber);
xSemaphoreGive(p_host_lib_obj->constant.mux_lock);