]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mac80211: count reg connection element in the size
authorMiri Korenblit <miriam.rachel.korenblit@intel.com>
Tue, 26 Aug 2025 17:25:24 +0000 (20:25 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Nov 2025 20:37:12 +0000 (15:37 -0500)
[ Upstream commit 1373f94148a5adac2f42c8ba9771105624fe4af0 ]

We currently don't count the reg connection length in the per-link
capability length. Fix it.

Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250826202512.b14fc82f736b.I03442382e8a07f6f9836bcdac2e22ce8afbe6a21@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/mac80211/mlme.c

index dd650a127a3174c25cd20251773798f39c436ee5..f38881b927d1741344b6a06efe1efb64c5b7394d 100644 (file)
@@ -2112,8 +2112,11 @@ ieee80211_link_common_elems_size(struct ieee80211_sub_if_data *sdata,
                sizeof(struct ieee80211_he_mcs_nss_supp) +
                IEEE80211_HE_PPE_THRES_MAX_LEN;
 
-       if (sband->band == NL80211_BAND_6GHZ)
+       if (sband->band == NL80211_BAND_6GHZ) {
                size += 2 + 1 + sizeof(struct ieee80211_he_6ghz_capa);
+               /* reg connection */
+               size += 4;
+       }
 
        size += 2 + 1 + sizeof(struct ieee80211_eht_cap_elem) +
                sizeof(struct ieee80211_eht_mcs_nss_supp) +