SAE: Check for invalid Rejected Groups element length explicitly on STA

Instead of practically ignoring an odd octet at the end of the element,
check for such invalid case explicitly. This is needed to avoid a
potential group downgrade attack.

Fixes: 444d76f74f65 ("SAE: Check that peer's rejected groups are not enabled")
Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2024-09-10 10:25:11 +05:30 committed by BOT
parent 7fc4d894a9
commit f9aa42b137

View File

@ -265,7 +265,7 @@ static int wpa3_sae_is_group_enabled(int group)
static int wpa3_check_sae_rejected_groups(const struct wpabuf *groups)
{
size_t i, count;
size_t i, count, len;
const u8 *pos;
if (!groups) {
@ -273,7 +273,14 @@ static int wpa3_check_sae_rejected_groups(const struct wpabuf *groups)
}
pos = wpabuf_head(groups);
count = wpabuf_len(groups) / 2;
len = wpabuf_len(groups);
if (len & 1) {
wpa_printf(MSG_DEBUG,
"SAE: Invalid length of the Rejected Groups element payload: %zu",
len);
return 1;
}
count = len / 2;
for (i = 0; i < count; i++) {
int enabled;
u16 group;