]> www.infradead.org Git - nvme.git/commitdiff
wifi: mac80211: fix Spatial Reuse element size check
authorLingbo Kong <quic_lingbok@quicinc.com>
Thu, 16 May 2024 02:18:53 +0000 (10:18 +0800)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 29 May 2024 13:34:46 +0000 (15:34 +0200)
Currently, the way to check the size of Spatial Reuse IE data in the
ieee80211_parse_extension_element() is incorrect.

This is because the len variable in the ieee80211_parse_extension_element()
function is equal to the size of Spatial Reuse IE data minus one and the
value of returned by the ieee80211_he_spr_size() function is equal to
the length of Spatial Reuse IE data. So the result of the
len >= ieee80211_he_spr_size(data) statement always false.

To address this issue and make it consistent with the logic used elsewhere
with ieee80211_he_oper_size(), change the
"len >= ieee80211_he_spr_size(data)" to
“len >= ieee80211_he_spr_size(data) - 1”.

Fixes: 9d0480a7c05b ("wifi: mac80211: move element parsing to a new file")
Signed-off-by: Lingbo Kong <quic_lingbok@quicinc.com>
Link: https://msgid.link/20240516021854.5682-2-quic_lingbok@quicinc.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/parse.c

index 55e5497f89781c0fc2c74965b30b966366672d25..055a60e90979b32129d6ba93a2361aec70af0cbb 100644 (file)
@@ -111,7 +111,7 @@ ieee80211_parse_extension_element(u32 *crc,
                if (params->mode < IEEE80211_CONN_MODE_HE)
                        break;
                if (len >= sizeof(*elems->he_spr) &&
-                   len >= ieee80211_he_spr_size(data))
+                   len >= ieee80211_he_spr_size(data) - 1)
                        elems->he_spr = data;
                break;
        case WLAN_EID_EXT_HE_6GHZ_CAPA: