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

AP MLD: Do not include empty MLO KDEs

Browse source 
Do include group MLO KDEs for links for which the information is
missing.

In addition, set the KDE buffer length based on the added data.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
This commit is contained in:
Ilan Peer 2023-11-21 17:23:58 +02:00 committed by Jouni Malinen
parent ecd9ea0c8a
commit 780e72cc14
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ap/wpa_auth.c
View file

@ -3888,7 +3888,8 @@ static u8 * wpa_auth_ml_group_kdes(struct wpa_state_machine *sm, u8 *pos)
/* Add MLO GTK KDEs */ /* Add MLO GTK KDEs */
for (i = 0, link_id = 0; link_id < MAX_NUM_MLD_LINKS; link_id++) { for (i = 0, link_id = 0; link_id < MAX_NUM_MLD_LINKS; link_id++) {
if (!sm->mld_links[link_id].valid) if (!sm->mld_links[link_id].valid ||
!ml_key_info.links[i].gtk_len)
continue; continue;
wpa_printf(MSG_DEBUG, "RSN: MLO GTK: link=%u", link_id); wpa_printf(MSG_DEBUG, "RSN: MLO GTK: link=%u", link_id);
@ -3920,7 +3921,8 @@ static u8 * wpa_auth_ml_group_kdes(struct wpa_state_machine *sm, u8 *pos)
/* Add MLO IGTK KDEs */ /* Add MLO IGTK KDEs */
for (i = 0, link_id = 0; link_id < MAX_NUM_MLD_LINKS; link_id++) { for (i = 0, link_id = 0; link_id < MAX_NUM_MLD_LINKS; link_id++) {
if (!sm->mld_links[link_id].valid) if (!sm->mld_links[link_id].valid ||
!ml_key_info.links[i].igtk_len)
continue; continue;
wpa_printf(MSG_DEBUG, "RSN: MLO IGTK: link=%u", link_id); wpa_printf(MSG_DEBUG, "RSN: MLO IGTK: link=%u", link_id);
@ -3959,7 +3961,9 @@ static u8 * wpa_auth_ml_group_kdes(struct wpa_state_machine *sm, u8 *pos)
/* Add MLO BIGTK KDEs */ /* Add MLO BIGTK KDEs */
for (i = 0, link_id = 0; link_id < MAX_NUM_MLD_LINKS; link_id++) { for (i = 0, link_id = 0; link_id < MAX_NUM_MLD_LINKS; link_id++) {
if (!sm->mld_links[link_id].valid) if (!sm->mld_links[link_id].valid ||
!ml_key_info.links[i].bigtk ||
!ml_key_info.links[i].igtk_len)
continue; continue;
wpa_printf(MSG_DEBUG, "RSN: MLO BIGTK: link=%u", link_id); wpa_printf(MSG_DEBUG, "RSN: MLO BIGTK: link=%u", link_id);
@ -4755,7 +4759,8 @@ SM_STATE(WPA_PTK_GROUP, REKEYNEGOTIATING)
return; return;
kde = pos = kde_buf; kde = pos = kde_buf;
wpa_auth_ml_group_kdes(sm, pos); pos = wpa_auth_ml_group_kdes(sm, pos);
kde_len = pos - kde_buf;
} }
#endif /* CONFIG_IEEE80211BE */ #endif /* CONFIG_IEEE80211BE */
} else { } else {