wifi: mac80211: consider EHT element size in assoc request
authorJohannes Berg <johannes.berg@intel.com>
Fri, 1 Jul 2022 14:22:29 +0000 (16:22 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Fri, 15 Jul 2022 09:43:18 +0000 (11:43 +0200)
We need to consider the (maximum) size of the EHT element
we'll add for the association request, otherwise we may run
out of space.

Fixes: 820acc810fb6 ("mac80211: Add EHT capabilities to association/probe request")
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c

index 152d011c84f0ad528811a5ea13d35d05b1836514..3cb1f091f17e95c7db2bcb0a67710380d201ce75 100644 (file)
@@ -987,6 +987,9 @@ static int ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata)
                                sizeof(struct ieee80211_he_mcs_nss_supp) +
                                IEEE80211_HE_PPE_THRES_MAX_LEN +
                        2 + 1 + sizeof(struct ieee80211_he_6ghz_capa) +
+                       2 + 1 + sizeof(struct ieee80211_eht_cap_elem) + /* EHT */
+                       sizeof(struct ieee80211_eht_mcs_nss_supp) +
+                       IEEE80211_EHT_PPE_THRES_MAX_LEN +
                        assoc_data->ie_len + /* extra IEs */
                        (assoc_data->fils_kek_len ? 16 /* AES-SIV */ : 0) +
                        9 + /* WMM */