From: Johannes Berg Date: Fri, 1 Jul 2022 14:22:29 +0000 (+0200) Subject: wifi: mac80211: consider EHT element size in assoc request X-Git-Tag: v6.0-rc1~141^2~64^2~107 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a95fe067825526b10c8a165df2d77db1ddce42fa;p=thirdparty%2Flinux.git wifi: mac80211: consider EHT element size in assoc request 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 --- diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 152d011c84f0a..3cb1f091f17e9 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -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 */