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

SAE: Make Anti-Clogging token element parsing simpler

Browse source 
This will hopefully be easier for static analyzers to understand.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2022-05-08 17:14:34 +03:00
parent a6e04a0676
commit 63eb98a8ee
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
wpa_supplicant/sme.c
View file

@ -1293,21 +1293,24 @@ static int sme_sae_auth(struct wpa_supplicant *wpa_s, u16 auth_transaction,
token_len = len - sizeof(le16); token_len = len - sizeof(le16);
h2e = wpa_s->sme.sae.h2e; h2e = wpa_s->sme.sae.h2e;
if (h2e) { if (h2e) {
u8 id, elen, extid;
if (token_len < 3) { if (token_len < 3) {
wpa_dbg(wpa_s, MSG_DEBUG, wpa_dbg(wpa_s, MSG_DEBUG,
"SME: Too short SAE anti-clogging token container"); "SME: Too short SAE anti-clogging token container");
return -1; return -1;
} }
if (token_pos[0] != WLAN_EID_EXTENSION || id = *token_pos++;
token_pos[1] == 0 || elen = *token_pos++;
token_pos[1] > token_len - 2 || extid = *token_pos++;
token_pos[2] != WLAN_EID_EXT_ANTI_CLOGGING_TOKEN) { if (id != WLAN_EID_EXTENSION ||
elen == 0 || elen > token_len - 2 ||
extid != WLAN_EID_EXT_ANTI_CLOGGING_TOKEN) {
wpa_dbg(wpa_s, MSG_DEBUG, wpa_dbg(wpa_s, MSG_DEBUG,
"SME: Invalid SAE anti-clogging token container header"); "SME: Invalid SAE anti-clogging token container header");
return -1; return -1;
} }
token_len = token_pos[1] - 1; token_len = elen - 1;
token_pos += 3;
} }
wpa_s->sme.sae_token = wpabuf_alloc_copy(token_pos, token_len); wpa_s->sme.sae_token = wpabuf_alloc_copy(token_pos, token_len);
wpa_hexdump_buf(MSG_DEBUG, "SME: Requested anti-clogging token", wpa_hexdump_buf(MSG_DEBUG, "SME: Requested anti-clogging token",