mirror of
https://github.com/espressif/esp-idf.git
synced 2026-09-22 13:01:16 +03:00
fix(esp_wifi): Harden dpp Auth confirm and drop mismatched auth confirms
This commit is contained in:
Submodule components/esp_wifi/lib updated: b3074d18b3...f54999f6d0
@@ -286,8 +286,12 @@ static void esp_dpp_rx_auth_conf(struct action_rx_param *rx_param, uint8_t *dpp_
|
||||
if (os_memcmp(rx_param->sa, auth->peer_mac_addr, ETH_ALEN) != 0) {
|
||||
wpa_printf(MSG_DEBUG, "DPP: MAC address mismatch (expected "
|
||||
MACSTR ") - drop", MAC2STR(auth->peer_mac_addr));
|
||||
rc = ESP_ERR_DPP_FAILURE;
|
||||
goto fail;
|
||||
return;
|
||||
}
|
||||
|
||||
if (auth->auth_success || !auth->waiting_auth_conf) {
|
||||
wpa_printf(MSG_DEBUG, "DPP: Not waiting for Auth Confirm - drop");
|
||||
return;
|
||||
}
|
||||
|
||||
eloop_cancel_timeout(esp_dpp_auth_conf_wait_timeout, NULL, NULL);
|
||||
@@ -328,6 +332,11 @@ static esp_err_t esp_dpp_rx_peer_disc_resp(struct action_rx_param *rx_param)
|
||||
return ESP_ERR_INVALID_ARG;
|
||||
}
|
||||
|
||||
if (!auth) {
|
||||
wpa_printf(MSG_DEBUG, "DPP: No DPP Authentication in progress - drop");
|
||||
return ESP_OK;
|
||||
}
|
||||
|
||||
if (rx_param->vendor_data_len < 2) {
|
||||
wpa_printf(MSG_INFO, "DPP: Too short vendor specific data");
|
||||
return ESP_FAIL;
|
||||
|
||||
@@ -2687,6 +2687,12 @@ int dpp_auth_conf_rx(struct dpp_authentication *auth, const u8 *hdr,
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!auth->waiting_auth_conf) {
|
||||
wpa_printf(MSG_DEBUG,
|
||||
"DPP: Not waiting for Auth Confirm - drop");
|
||||
return -1;
|
||||
}
|
||||
|
||||
auth->waiting_auth_conf = 0;
|
||||
|
||||
wrapped_data = dpp_get_attr(attr_start, attr_len, DPP_ATTR_WRAPPED_DATA,
|
||||
|
||||
Reference in New Issue
Block a user