Skip to content

xtensa/espressif: fix lock-order deadlock in esp_wifi_event_handler() #20178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Sep 18, 2026
Merged

xtensa/espressif: fix lock-order deadlock in esp_wifi_event_handler() #20178

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions arch/xtensa/src/common/espressif/esp_wifi_event_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,20 @@ static void esp_wifi_event_handler(void *arg, esp_event_base_t event_base,
UNUSED(event_base);

net_lock();
esp_wifi_lock(true);

/* esp_wifi_lock() no longer spans the esp_wlan_*_hook() calls below:
* they take netdev_lock(), which ifdown already holds *around* its own
* esp_wifi_lock() call, so locking both here in the opposite order
* deadlocked ifdown against this handler.
*/

switch (event_id)
{
#ifdef ESP_WLAN_DEVS
case WIFI_EVENT_SCAN_DONE:
esp_wifi_lock(true);
esp_wifi_scan_event_parse();
esp_wifi_lock(false);
break;
#endif
case WIFI_EVENT_HOME_CHANNEL_CHANGE:
Expand All @@ -168,7 +175,9 @@ static void esp_wifi_event_handler(void *arg, esp_event_base_t event_base,
{
wlinfo("Wi-Fi sta start\n");

esp_wifi_lock(true);
ret = esp_wifi_set_ps(ps_type);
esp_wifi_lock(false);
if (ret != 0)
{
wlerr("Failed to set power save type\n");
Expand Down Expand Up @@ -214,7 +223,9 @@ static void esp_wifi_event_handler(void *arg, esp_event_base_t event_base,
{
wlinfo("INFO: Wi-Fi softap start\n");
esp_wlan_softap_connect_success_hook();
esp_wifi_lock(true);
ret = esp_wifi_set_ps(ps_type);
esp_wifi_lock(false);
if (ret != 0)
{
wlerr("Failed to set power save type\n");
Expand Down Expand Up @@ -260,7 +271,6 @@ static void esp_wifi_event_handler(void *arg, esp_event_base_t event_base,
}
}

esp_wifi_lock(false);
net_unlock();
}

Expand Down
Loading