Skip to content

Commit 768c0b1

Browse files
committed
mac80211: validate extended element ID is present
Before attempting to parse an extended element, verify that the extended element ID is present. Fixes: 41cbb0f ("mac80211: add support for HE") Reported-by: syzbot+59bdff68edce82e393b6@syzkaller.appspotmail.com Link: https://lore.kernel.org/r/20211211201023.f30a1b128c07.I5cacc176da94ba316877c6e10fe3ceec8b4dbd7d@changeid Cc: stable@vger.kernel.org Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent e08ebd6 commit 768c0b1

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

net/mac80211/util.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,12 @@ static void ieee80211_parse_extension_element(u32 *crc,
943943
struct ieee802_11_elems *elems)
944944
{
945945
const void *data = elem->data + 1;
946-
u8 len = elem->datalen - 1;
946+
u8 len;
947+
948+
if (!elem->datalen)
949+
return;
950+
951+
len = elem->datalen - 1;
947952

948953
switch (elem->data[0]) {
949954
case WLAN_EID_EXT_HE_MU_EDCA:

0 commit comments

Comments
 (0)