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): Ensure dpp auth structure is deinited in dpp task context

Browse Source 
- Ensure that the dpp auth data gets deinited only in DPP task context to ensure
  that there are no concurrency issues in usage of DPP auth data.
This commit is contained in:
jgujarathi 2024-03-04 12:08:51 +05:30
parent 994b4ed459
commit 537cf9bfc0
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
components/wpa_supplicant/esp_supplicant/src/esp_dpp.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2020-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -64,20 +64,31 @@ esp_err_t esp_dpp_post_evt(uint32_t evt_id, uint32_t data)
if (evt_id != SIG_DPP_DEL_TASK) { if (evt_id != SIG_DPP_DEL_TASK) {
DPP_API_UNLOCK(); DPP_API_UNLOCK();
} }
wpa_printf(MSG_DEBUG,"DPP: Sent event %d to DPP task", evt_id);
return ret; return ret;
end: end:
if (evt) { if (evt) {
os_free(evt); os_free(evt);
} }
wpa_printf(MSG_ERROR,"DPP: Failed to send event %d to DPP task", evt_id);
return ret; return ret;
} }
static uint8_t esp_dpp_deinit_auth(void)
{
esp_err_t ret = esp_dpp_post_evt(SIG_DPP_DEINIT_AUTH, 0);
if (ESP_OK != ret) {
wpa_printf(MSG_ERROR, "Failed to post DPP auth deinit to DPP Task(status=%d)", ret);
return ret;
}
return ESP_OK;
}
static void esp_dpp_call_cb(esp_supp_dpp_event_t evt, void *data) static void esp_dpp_call_cb(esp_supp_dpp_event_t evt, void *data)
{ {
if ( evt == ESP_SUPP_DPP_FAIL && s_dpp_ctx.dpp_auth) { if ( evt == ESP_SUPP_DPP_FAIL && s_dpp_ctx.dpp_auth) {
dpp_auth_deinit(s_dpp_ctx.dpp_auth); esp_dpp_deinit_auth();
s_dpp_ctx.dpp_auth = NULL;
} }
s_dpp_ctx.dpp_event_cb(evt, data); s_dpp_ctx.dpp_event_cb(evt, data);
} }
@ -89,10 +100,6 @@ static void esp_dpp_auth_conf_wait_timeout(void *eloop_ctx, void *timeout_ctx)
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"DPP: Terminate authentication exchange due to Auth Confirm timeout"); "DPP: Terminate authentication exchange due to Auth Confirm timeout");
if (s_dpp_ctx.dpp_auth) {
dpp_auth_deinit(s_dpp_ctx.dpp_auth);
s_dpp_ctx.dpp_auth = NULL;
}
esp_dpp_call_cb(ESP_SUPP_DPP_FAIL, (void *)ESP_ERR_DPP_AUTH_TIMEOUT); esp_dpp_call_cb(ESP_SUPP_DPP_FAIL, (void *)ESP_ERR_DPP_AUTH_TIMEOUT);
} }
@ -578,6 +585,15 @@ static void esp_dpp_task(void *pvParameters )
} }
break; break;
case SIG_DPP_DEINIT_AUTH: {
if (s_dpp_ctx.dpp_auth) {
dpp_auth_deinit(s_dpp_ctx.dpp_auth);
s_dpp_ctx.dpp_auth = NULL;
}
wpa_printf(MSG_DEBUG, "DPP auth deinintialized");
}
break;
default: default:
break; break;
} }

1
components/wpa_supplicant/esp_supplicant/src/esp_dpp_i.h
View File

@ -25,6 +25,7 @@ enum SIG_DPP {
SIG_DPP_LISTEN_NEXT_CHANNEL, SIG_DPP_LISTEN_NEXT_CHANNEL,
SIG_DPP_DEL_TASK, SIG_DPP_DEL_TASK,
SIG_DPP_START_NET_INTRO, SIG_DPP_START_NET_INTRO,
SIG_DPP_DEINIT_AUTH,
SIG_DPP_MAX, SIG_DPP_MAX,
}; };