mirror of
https://github.com/espressif/esp-idf.git
synced 2024-09-21 06:56:11 -04:00
fix(wpa_supplicant): Fix a crash in esp_wifi_wps_disable
- 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:
parent
a65cb7669c
commit
078da4b2d2
@ -158,9 +158,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();
|
||||||
}
|
}
|
||||||
@ -221,6 +223,12 @@ int wps_post(uint32_t sig, uint32_t par)
|
|||||||
wpa_printf(MSG_DEBUG, "wps post: sig=%" PRId32 " cnt=%d", sig, s_wps_sig_cnt[sig]);
|
wpa_printf(MSG_DEBUG, "wps post: sig=%" PRId32 " 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=%" PRId32 " processing", sig);
|
wpa_printf(MSG_DEBUG, "wps post: sig=%" PRId32 " processing", sig);
|
||||||
DATA_MUTEX_GIVE();
|
DATA_MUTEX_GIVE();
|
||||||
@ -1710,12 +1718,6 @@ int wps_task_deinit(void)
|
|||||||
wps_rxq_deinit();
|
wps_rxq_deinit();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s_wps_data_lock) {
|
|
||||||
os_semphr_delete(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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1727,11 +1729,13 @@ int wps_task_init(void)
|
|||||||
*/
|
*/
|
||||||
wps_task_deinit();
|
wps_task_deinit();
|
||||||
|
|
||||||
|
if (!s_wps_data_lock) {
|
||||||
s_wps_data_lock = os_recursive_mutex_create();
|
s_wps_data_lock = os_recursive_mutex_create();
|
||||||
if (!s_wps_data_lock) {
|
if (!s_wps_data_lock) {
|
||||||
wpa_printf(MSG_ERROR, "wps task init: failed to alloc data lock");
|
wpa_printf(MSG_ERROR, "wps task init: failed to alloc data lock");
|
||||||
goto _wps_no_mem;
|
goto _wps_no_mem;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
s_wps_api_sem = os_semphr_create(1, 0);
|
s_wps_api_sem = os_semphr_create(1, 0);
|
||||||
if (!s_wps_api_sem) {
|
if (!s_wps_api_sem) {
|
||||||
@ -1908,6 +1912,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;
|
||||||
}
|
}
|
||||||
@ -1935,11 +1944,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
|
||||||
|
Loading…
Reference in New Issue
Block a user