]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mac80211: Fix HE capabilities element check
authorIlan Peer <ilan.peer@intel.com>
Sun, 7 Sep 2025 08:51:17 +0000 (11:51 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Nov 2025 20:34:22 +0000 (15:34 -0500)
[ Upstream commit ea928544f3215fdeac24d66bef85e10bb638b8c1 ]

The element data length check did not account for the extra
octet used for the extension ID. Fix it.

Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250907115109.8da0012e2286.I8c0c69a0011f7153c13b365b14dfef48cfe7c3e3@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/mlme.c

index fd2bc70afa0cd353a5daf13c2d75c175e613ed65..0cba454d6e685c2650aa42b5d833173d6db67da9 100644 (file)
@@ -5148,7 +5148,7 @@ static u8 ieee80211_max_rx_chains(struct ieee80211_link_data *link,
        he_cap_elem = cfg80211_find_ext_elem(WLAN_EID_EXT_HE_CAPABILITY,
                                             ies->data, ies->len);
 
-       if (!he_cap_elem || he_cap_elem->datalen < sizeof(*he_cap))
+       if (!he_cap_elem || he_cap_elem->datalen < sizeof(*he_cap) + 1)
                return chains;
 
        /* skip one byte ext_tag_id */