alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix(wpa_supplicant): Fix a crash in esp_wifi_wps_disable

Browse Source 
- Fixes a crash observed in esp_wifi_wps_disable when wps process
  is ongoing, caused due to concurrency issues in cancelling timers.
This commit is contained in:
jgujarathi 2023-11-17 12:39:13 +05:30
parent 8103512379
commit b167df155f
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
components/wpa_supplicant/esp_supplicant/src/esp_wps.c
View File

@ -185,9 +185,11 @@ void wps_task(void *pvParameters )
if (e->sig == SIG_WPS_ENABLE) { if (e->sig == SIG_WPS_ENABLE) {
param->ret = wifi_wps_enable_internal((esp_wps_config_t *)(param->arg)); param->ret = wifi_wps_enable_internal((esp_wps_config_t *)(param->arg));
} else if (e->sig == SIG_WPS_DISABLE) { } else if (e->sig == SIG_WPS_DISABLE) {
DATA_MUTEX_TAKE();
param->ret = wifi_wps_disable_internal(); param->ret = wifi_wps_disable_internal();
del_task = true; del_task = true;
s_wps_task_hdl = NULL; s_wps_task_hdl = NULL;
DATA_MUTEX_GIVE();
} else { } else {
param->ret = wifi_station_wps_start(); param->ret = wifi_station_wps_start();
} }
@ -248,6 +250,12 @@ int wps_post(uint32_t sig, uint32_t par)
wpa_printf(MSG_DEBUG, "wps post: sig=%d cnt=%d", sig, s_wps_sig_cnt[sig]); wpa_printf(MSG_DEBUG, "wps post: sig=%d cnt=%d", sig, s_wps_sig_cnt[sig]);
DATA_MUTEX_TAKE(); DATA_MUTEX_TAKE();
if (!s_wps_task_hdl) {
wpa_printf(MSG_DEBUG, "wps post: sig=%" PRId32 " failed as wps task has been deinited", sig);
DATA_MUTEX_GIVE();
return ESP_FAIL;
}
if (s_wps_sig_cnt[sig]) { if (s_wps_sig_cnt[sig]) {
wpa_printf(MSG_DEBUG, "wps post: sig=%d processing", sig); wpa_printf(MSG_DEBUG, "wps post: sig=%d processing", sig);
DATA_MUTEX_GIVE(); DATA_MUTEX_GIVE();
@ -2002,12 +2010,6 @@ int wps_task_deinit(void)
wps_rxq_deinit(); wps_rxq_deinit();
} }
if (s_wps_data_lock) {
vSemaphoreDelete(s_wps_data_lock);
s_wps_data_lock = NULL;
wpa_printf(MSG_DEBUG, "wps task deinit: free data lock");
}
return ESP_OK; return ESP_OK;
} }
@ -2019,10 +2021,12 @@ int wps_task_init(void)
*/ */
wps_task_deinit(); wps_task_deinit();
s_wps_data_lock = xSemaphoreCreateRecursiveMutex();
if (!s_wps_data_lock) { if (!s_wps_data_lock) {
wpa_printf(MSG_ERROR, "wps task init: failed to alloc data lock"); s_wps_data_lock = xSemaphoreCreateRecursiveMutex();
goto _wps_no_mem; if (!s_wps_data_lock) {
wpa_printf(MSG_ERROR, "wps task init: failed to alloc data lock");
goto _wps_no_mem;
}
} }
s_wps_api_sem = xSemaphoreCreateCounting(1, 0); s_wps_api_sem = xSemaphoreCreateCounting(1, 0);
@ -2202,6 +2206,11 @@ int wifi_wps_enable_internal(const esp_wps_config_t *config)
int wifi_wps_disable_internal(void) int wifi_wps_disable_internal(void)
{ {
wps_set_status(WPS_STATUS_DISABLE); wps_set_status(WPS_STATUS_DISABLE);
/* Call wps_delete_timer to delete all WPS timer, no timer will call wps_post()
* to post message to wps_task once this function returns.
*/
wps_delete_timer();
wifi_station_wps_deinit(); wifi_station_wps_deinit();
return ESP_OK; return ESP_OK;
} }
@ -2227,11 +2236,6 @@ int esp_wifi_wps_disable(void)
wpa_printf(MSG_INFO, "wifi_wps_disable"); wpa_printf(MSG_INFO, "wifi_wps_disable");
wps_set_type(WPS_TYPE_DISABLE); /* Notify WiFi task */ wps_set_type(WPS_TYPE_DISABLE); /* Notify WiFi task */
/* Call wps_delete_timer to delete all WPS timer, no timer will call wps_post()
* to post message to wps_task once this function returns.
*/
wps_delete_timer();
#ifdef USE_WPS_TASK #ifdef USE_WPS_TASK
ret = wps_post_block(SIG_WPS_DISABLE, 0); ret = wps_post_block(SIG_WPS_DISABLE, 0);
#else #else