DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

AP MLD: Work around delayed STA entry addition for SAE confirm

Browse source 
The driver is expected to have an STA entry for a non-AP MLD ready to
translate the address fields for SAE confirm messages. However, there is
at least a theoretical race condition in a case where the peer sends the
SAE confirm message quickly enough for the driver translation mechanism
to not be available to update the SAE confirm message addresses. Work
around that by searching for the STA entry using the link address of the
non-AP MLD if no match is found based on the MLD MAC address.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2024-09-01 13:14:12 +03:00 committed by Jouni Malinen
parent f3fd2f699f
commit 63df62c6c0
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/ap/ieee802_11_eht.c
View file

@ -909,12 +909,32 @@ sae_confirm_skip_fixed_fields(struct hostapd_data *hapd,
/* /*
* At this stage we should already have an MLD station and actually SA * At this stage we should already have an MLD station and actually SA
* will be replaced with the MLD MAC address by the driver. * will be replaced with the MLD MAC address by the driver. However,
* there is at least a theoretical race condition in a case where the
* peer sends the SAE confirm message quickly enough for the driver
* translation mechanism to not be available to update the SAE confirm
* message addresses. Work around that by searching for the STA entry
* using the link address of the non-AP MLD if no match is found based
* on the MLD MAC address.
*/ */
sta = ap_get_sta(hapd, mgmt->sa); sta = ap_get_sta(hapd, mgmt->sa);
if (!sta) { if (!sta) {
wpa_printf(MSG_DEBUG, "SAE: No MLD STA for SAE confirm"); wpa_printf(MSG_DEBUG, "SAE: No MLD STA for SAE confirm");
return NULL; for (sta = hapd->sta_list; sta; sta = sta->next) {
int link_id = hapd->mld_link_id;
if (!sta->mld_info.mld_sta ||
sta->mld_info.links[link_id].valid ||
!ether_addr_equal(
mgmt->sa,
sta->mld_info.links[link_id].peer_addr))
continue;
wpa_printf(MSG_DEBUG,
"SAE: Found MLD STA for SAE confirm based on link address");
break;
}
if (!sta)
return NULL;
} }
if (!sta->sae || sta->sae->state < SAE_COMMITTED || !sta->sae->tmp) { if (!sta->sae || sta->sae->state < SAE_COMMITTED || !sta->sae->tmp) {