Merge branch 'bugfix/wpa3_sta_mem_leak_v5.2' into 'release/v5.2'

Fix a memory leak that occurs when SAE connection is interrupted (Backport v5.2) See merge request espressif/esp-idf!31652
espressif · Jun 24, 2024 · 51bd0da · 51bd0da
2 parents 1a48173 + 8b0895e
commit 51bd0da
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c b/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
@@ -258,7 +258,6 @@ static void wpa_sta_disconnected_cb(uint8_t reason_code)
         case WIFI_REASON_ASSOC_FAIL:
         case WIFI_REASON_CONNECTION_FAIL:
         case WIFI_REASON_HANDSHAKE_TIMEOUT:
-            esp_wpa3_free_sae_data();
             wpa_sta_clear_curr_pmksa();
             wpa_sm_notify_disassoc(&gWpaSm);
             break;
@@ -272,6 +271,7 @@ static void wpa_sta_disconnected_cb(uint8_t reason_code)
     owe_deinit();
 #endif /* CONFIG_OWE_STA */
 
+    esp_wpa3_free_sae_data();
     supplicant_sta_disconn_handler();
 }
+ −		esp32/libcore.a
+ −		esp32/libespnow.a
+ −		esp32/libmesh.a
+ −		esp32/libnet80211.a
+ −		esp32/libpp.a
+ −		esp32/libsmartconfig.a
+ −		esp32/libwapi.a
+ −		esp32c2/libcore.a
+ −		esp32c2/libespnow.a
+ −		esp32c2/libnet80211.a
+ −		esp32c2/libpp.a
+ −		esp32c2/libsmartconfig.a
+ −		esp32c3/libcore.a
+ −		esp32c3/libespnow.a
+ −		esp32c3/libmesh.a
+ −		esp32c3/libnet80211.a
+ −		esp32c3/libpp.a
+ −		esp32c3/libsmartconfig.a
+ −		esp32c3/libwapi.a
+ −		esp32c6/libcore.a
+ −		esp32c6/libespnow.a
+ −		esp32c6/libmesh.a
+ −		esp32c6/libnet80211.a
+ −		esp32c6/libpp.a
+ −		esp32c6/libsmartconfig.a
+ −		esp32c6/libwapi.a
+ −		esp32s2/libcore.a
+ −		esp32s2/libespnow.a
+ −		esp32s2/libmesh.a
+ −		esp32s2/libnet80211.a
+ −		esp32s2/libpp.a
+ −		esp32s2/libsmartconfig.a
+ −		esp32s2/libwapi.a
+ −		esp32s3/libcore.a
+ −		esp32s3/libespnow.a
+ −		esp32s3/libmesh.a
+ −		esp32s3/libnet80211.a
+ −		esp32s3/libpp.a
+ −		esp32s3/libsmartconfig.a
+ −		esp32s3/libwapi.a