Merge branch 'bugfix/pmksa_null_check' into 'master'

kapilkedawat · kapilkedawat · commit fb75c854cea6 · 2025-03-24T21:25:34.000+08:00
Draft: fix(wifi): Fix crash when set config is called with changed password Closes IDFGH-14863 and IDFGH-14926 Closes #15635 See merge request espressif/esp-idf!37840
diff --git a/components/wpa_supplicant/src/rsn_supp/wpa.c b/components/wpa_supplicant/src/rsn_supp/wpa.c
@@ -2167,11 +2167,13 @@ void wpa_sm_deinit(void)
 {
     struct wpa_sm *sm = &gWpaSm;
     pmksa_cache_deinit(sm->pmksa);
+    sm->pmksa = NULL;
     os_free(sm->ap_rsnxe);
     sm->ap_rsnxe = NULL;
     os_free(sm->assoc_rsnxe);
     wpa_sm_drop_sa(sm);
     sm->assoc_rsnxe = NULL;
+    memset(sm, 0, sizeof(*sm));
 }
 
 
@@ -3014,6 +3016,8 @@ int owe_process_assoc_resp(const u8 *rsn_ie, size_t rsn_len, const uint8_t *dh_i
 
 void wpa_sm_pmksa_cache_flush(struct wpa_sm *sm, void *network_ctx)
 {
-    pmksa_cache_flush(sm->pmksa, network_ctx, NULL, 0);
+    if (sm->pmksa) {
+        pmksa_cache_flush(sm->pmksa, network_ctx, NULL, 0);
+    }
 }
 #endif // ESP_SUPPLICANT

Original file line number	Diff line number	Diff line change
`@@ -2167,11 +2167,13 @@ void wpa_sm_deinit(void)`
`2167`	`2167`	`{`
`2168`	`2168`	`struct wpa_sm *sm = &gWpaSm;`
`2169`	`2169`	`pmksa_cache_deinit(sm->pmksa);`
	`2170`	`+ sm->pmksa = NULL;`
`2170`	`2171`	`os_free(sm->ap_rsnxe);`
`2171`	`2172`	`sm->ap_rsnxe = NULL;`
`2172`	`2173`	`os_free(sm->assoc_rsnxe);`
`2173`	`2174`	`wpa_sm_drop_sa(sm);`
`2174`	`2175`	`sm->assoc_rsnxe = NULL;`
	`2176`	`+ memset(sm, 0, sizeof(*sm));`
`2175`	`2177`	`}`
`2176`	`2178`
`2177`	`2179`
`@@ -3014,6 +3016,8 @@ int owe_process_assoc_resp(const u8 rsn_ie, size_t rsn_len, const uint8_t dh_i`
`3014`	`3016`
`3015`	`3017`	`void wpa_sm_pmksa_cache_flush(struct wpa_sm sm, void network_ctx)`
`3016`	`3018`	`{`
`3017`		`- pmksa_cache_flush(sm->pmksa, network_ctx, NULL, 0);`
	`3019`	`+ if (sm->pmksa) {`
	`3020`	`+ pmksa_cache_flush(sm->pmksa, network_ctx, NULL, 0);`
	`3021`	`+ }`
`3018`	`3022`	`}`
`3019`	`3023`	`#endif // ESP_SUPPLICANT`