Skip to content

Commit 3e45fbd

Browse files
committed
Merge: CVE-2024-42125: wifi: rtw89: fw: scan offload prohibit all 6 GHz channel if no 6 GHz sband
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4895 JIRA: https://issues.redhat.com/browse/RHEL-51809 CVE: CVE-2024-42125 ``` wifi: rtw89: fw: scan offload prohibit all 6 GHz channel if no 6 GHz sband We have some policy via BIOS to block uses of 6 GHz. In this case, 6 GHz sband will be NULL even if it is WiFi 7 chip. So, add NULL handling here to avoid crash. Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Link: https://msgid.link/20240412115729.8316-3-pkshih@realtek.com (cherry picked from commit bb38626) ``` Signed-off-by: CKI Backport Bot <cki-ci-bot+cki-gitlab-backport-bot@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: John B. Wyatt IV <jwyatt@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 5467dc9 + d8bcf18 commit 3e45fbd

File tree

1 file changed

+4
-0
lines changed
  • drivers/net/wireless/realtek/rtw89

1 file changed

+4
-0
lines changed

drivers/net/wireless/realtek/rtw89/fw.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4631,6 +4631,10 @@ static void rtw89_scan_get_6g_disabled_chan(struct rtw89_dev *rtwdev,
46314631
u8 i, idx;
46324632

46334633
sband = rtwdev->hw->wiphy->bands[NL80211_BAND_6GHZ];
4634+
if (!sband) {
4635+
option->prohib_chan = U64_MAX;
4636+
return;
4637+
}
46344638

46354639
for (i = 0; i < sband->n_channels; i++) {
46364640
chan = &sband->channels[i];

0 commit comments

Comments
 (0)