]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: cfg80211: enforce HE/EHT cap/oper consistency
authorJohannes Berg <johannes.berg@intel.com>
Wed, 3 Jun 2026 09:18:11 +0000 (11:18 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 3 Jun 2026 11:25:19 +0000 (13:25 +0200)
Xiang Mei reports that mac80211 could crash if eht_cap is set
but eht_oper isn't. Rather than fixing that for the individual
user(s), enforce that both HE/EHT have consistent elements.

Reported-by: Xiang Mei <xmei5@asu.edu>
Fixes: 22c64f37e1d4 ("wifi: mac80211: Update MCS15 support in link_conf")
Link: https://patch.msgid.link/20260603091812.101894-2-johannes@sipsolutions.net
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/nl80211.c

index dac2e8643c495279a8c82fe31f088b9f88e416de..76c537a6e8b52d6819cf2ea096fe3a2e941a7916 100644 (file)
@@ -6714,6 +6714,12 @@ static int nl80211_calculate_ap_params(struct cfg80211_ap_settings *params)
                        return -EINVAL;
        }
 
+       if (!!params->he_cap != !!params->he_oper)
+               return -EINVAL;
+
+       if (!!params->eht_cap != !!params->eht_oper)
+               return -EINVAL;
+
        return 0;
 }