From eb0df1622dec081635e81acd47776fa9a97637a5 Mon Sep 17 00:00:00 2001 From: Shreyas Sheth Date: Thu, 6 Aug 2026 15:58:18 +0530 Subject: [PATCH] fix(esp_wifi): Harden dpp Auth confirm and drop mismatched auth confirms --- components/esp_wifi/lib | 2 +- .../wpa_supplicant/esp_supplicant/src/esp_dpp.c | 12 +++++++++++- components/wpa_supplicant/src/common/dpp.c | 6 ++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 37db1f065a7..d5d28a23578 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 37db1f065a7cefebff338ae1e7acee91a4b35bef +Subproject commit d5d28a23578adbd67e71c3e14bd8528fea3e7b43 diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c b/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c index f7e37997450..d5d9d0bbb47 100644 --- a/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c +++ b/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c @@ -418,7 +418,12 @@ static int esp_dpp_rx_auth_conf(struct action_rx_param *rx_param, uint8_t *dpp_d 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)); - return ESP_ERR_DPP_FAILURE; + return ESP_OK; + } + + if (auth->auth_success || !auth->waiting_auth_conf) { + wpa_printf(MSG_DEBUG, "DPP: Not waiting for Auth Confirm - drop"); + return ESP_OK; } eloop_cancel_timeout(esp_dpp_auth_conf_wait_timeout, NULL, NULL); @@ -461,6 +466,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; diff --git a/components/wpa_supplicant/src/common/dpp.c b/components/wpa_supplicant/src/common/dpp.c index 85537d18fdf..019528f5117 100644 --- a/components/wpa_supplicant/src/common/dpp.c +++ b/components/wpa_supplicant/src/common/dpp.c @@ -2698,6 +2698,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,