mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
d05fbef769
* mac80211: backport security fixes
This mainly affects scanning and beacon parsing, especially with MBSSID enabled
Fixes: CVE-2022-41674
Fixes: CVE-2022-42719
Fixes: CVE-2022-42720
Fixes: CVE-2022-42721
Fixes: CVE-2022-42722
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry-picked from commit 26f400210d6b3780fcc0deb89b9741837df9c8b8)
* mac80211: refresh patches
355-wifi-cfg80211-fix-BSS-refcounting-bugs.patch - 5a52384a51
Co-authored-by: Felix Fietkau <nbd@nbd.name>
Co-authored-by: 1054009064 <1054009064@users.noreply.github.com>
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
--- a/net/mac80211/vht.c
|
|
+++ b/net/mac80211/vht.c
|
|
@@ -135,7 +135,8 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(stru
|
|
have_80mhz = false;
|
|
for (i = 0; i < sband->n_channels; i++) {
|
|
if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED |
|
|
- IEEE80211_CHAN_NO_80MHZ))
|
|
+ IEEE80211_CHAN_NO_80MHZ) &
|
|
+ (sband->band != NL80211_BAND_2GHZ))
|
|
continue;
|
|
|
|
have_80mhz = true;
|
|
--- a/net/mac80211/util.c
|
|
+++ b/net/mac80211/util.c
|
|
@@ -1925,7 +1925,8 @@ static int ieee80211_build_preq_ies_band
|
|
/* Check if any channel in this sband supports at least 80 MHz */
|
|
for (i = 0; i < sband->n_channels; i++) {
|
|
if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED |
|
|
- IEEE80211_CHAN_NO_80MHZ))
|
|
+ IEEE80211_CHAN_NO_80MHZ) &
|
|
+ (sband->band != NL80211_BAND_2GHZ))
|
|
continue;
|
|
|
|
have_80mhz = true;
|
|
--- a/net/mac80211/mlme.c
|
|
+++ b/net/mac80211/mlme.c
|
|
@@ -5116,7 +5116,8 @@ static int ieee80211_prep_channel(struct
|
|
have_80mhz = false;
|
|
for (i = 0; i < sband->n_channels; i++) {
|
|
if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED |
|
|
- IEEE80211_CHAN_NO_80MHZ))
|
|
+ IEEE80211_CHAN_NO_80MHZ) &
|
|
+ (sband->band != NL80211_BAND_2GHZ))
|
|
continue;
|
|
|
|
have_80mhz = true;
|