From e1482b1e9afdee69fe95e54bc166a43512408b9c Mon Sep 17 00:00:00 2001 From: Kirill Date: Sun, 22 Jan 2023 09:40:27 +0200 Subject: [PATCH] Fix uninitialized cfg80211_chan_def for rtlwifi (#4714) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Igor Pečovnik --- .../compilation/patch/drivers_network.sh | 11 +++++--- ...-Fix-uninitialized-cfg80211-chan-def.patch | 25 +++++++++++++++++++ ...-Fix-uninitialized-cfg80211-chan-def.patch | 25 +++++++++++++++++++ ...-Fix-uninitialized-cfg80211-chan-def.patch | 25 +++++++++++++++++++ ...-Fix-uninitialized-cfg80211-chan-def.patch | 25 +++++++++++++++++++ 5 files changed, 108 insertions(+), 3 deletions(-) create mode 100644 patch/misc/wireless-rtl8188eu-Fix-uninitialized-cfg80211-chan-def.patch create mode 100644 patch/misc/wireless-rtl8189es-Fix-uninitialized-cfg80211-chan-def.patch create mode 100644 patch/misc/wireless-rtl8723du-Fix-uninitialized-cfg80211-chan-def.patch create mode 100644 patch/misc/wireless-rtl8822bs-Fix-uninitialized-cfg80211-chan-def.patch diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index 16fe01078..5f46f2dd4 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -48,7 +48,9 @@ driver_rtl8189ES() sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8189es\/Kconfig"' \ "$kerneldir/drivers/net/wireless/Kconfig" + process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-uninitialized-cfg80211-chan-def.patch" "applying" process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-p2p-go-advertising.patch" "applying" + fi } @@ -294,11 +296,10 @@ driver_rtl8188EU_rtl8188ETV() "$kerneldir/drivers/net/wireless/Kconfig" process_patch_file "${SRC}/patch/misc/wireless-rtl8188eu.patch" "applying" - - # add support for K5.12+ process_patch_file "${SRC}/patch/misc/wireless-realtek-8188eu-5.12.patch" "applying" - + process_patch_file "${SRC}/patch/misc/wireless-rtl8188eu-Fix-uninitialized-cfg80211-chan-def.patch" "applying" process_patch_file "${SRC}/patch/misc/wireless-rtl8188eu-Fix-p2p-go-advertising.patch" "applying" + fi } @@ -475,7 +476,9 @@ driver_rtl8723DU() "$kerneldir/drivers/net/wireless/Kconfig" process_patch_file "${SRC}/patch/misc/wireless-rtl8723du-5.19.2.patch" "applying" + process_patch_file "${SRC}/patch/misc/wireless-rtl8723du-Fix-uninitialized-cfg80211-chan-def.patch" "applying" process_patch_file "${SRC}/patch/misc/wireless-rtl8723du-Fix-p2p-go-advertising.patch" "applying" + fi } @@ -510,7 +513,9 @@ driver_rtl8822BS() sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8822bs\/Kconfig"' \ "$kerneldir/drivers/net/wireless/Kconfig" + process_patch_file "${SRC}/patch/misc/wireless-rtl8822bs-Fix-uninitialized-cfg80211-chan-def.patch" "applying" process_patch_file "${SRC}/patch/misc/wireless-rtl8822bs-Fix-p2p-go-advertising.patch" "applying" + fi } diff --git a/patch/misc/wireless-rtl8188eu-Fix-uninitialized-cfg80211-chan-def.patch b/patch/misc/wireless-rtl8188eu-Fix-uninitialized-cfg80211-chan-def.patch new file mode 100644 index 000000000..cbd8b39c0 --- /dev/null +++ b/patch/misc/wireless-rtl8188eu-Fix-uninitialized-cfg80211-chan-def.patch @@ -0,0 +1,25 @@ +From f8e116deb69b22fd056a121ee1d79fb8d7c490b8 Mon Sep 17 00:00:00 2001 +From: Kirill Zhumarin +Date: Thu, 19 Jan 2023 21:46:16 +0000 +Subject: [PATCH] Fix uninitialized cfg80211_chan_def + +Signed-off-by: Kirill Zhumarin +--- + drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c +index 56f87295e..a871dcc22 100644 +--- a/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c ++++ b/drivers/net/wireless/rtl8188eu/os_dep/linux/ioctl_cfg80211.c +@@ -430,7 +430,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8 + u8 ret = _SUCCESS; + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) +- struct cfg80211_chan_def chdef; ++ struct cfg80211_chan_def chdef = {}; + + if (!rtw_cfg80211_allow_ch_switch_notify(adapter)) + goto exit; +-- +Created with Armbian build tools https://github.com/armbian/build diff --git a/patch/misc/wireless-rtl8189es-Fix-uninitialized-cfg80211-chan-def.patch b/patch/misc/wireless-rtl8189es-Fix-uninitialized-cfg80211-chan-def.patch new file mode 100644 index 000000000..fd5097761 --- /dev/null +++ b/patch/misc/wireless-rtl8189es-Fix-uninitialized-cfg80211-chan-def.patch @@ -0,0 +1,25 @@ +From f8e116deb69b22fd056a121ee1d79fb8d7c490b8 Mon Sep 17 00:00:00 2001 +From: Kirill Zhumarin +Date: Thu, 19 Jan 2023 21:46:16 +0000 +Subject: [PATCH] Fix uninitialized cfg80211_chan_def + +Signed-off-by: Kirill Zhumarin +--- + drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c +index 4e810e5c4..b4e0acb70 100644 +--- a/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c ++++ b/drivers/net/wireless/rtl8189es/os_dep/linux/ioctl_cfg80211.c +@@ -430,7 +430,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8 + u8 ret = _SUCCESS; + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) +- struct cfg80211_chan_def chdef; ++ struct cfg80211_chan_def chdef = {}; + + if (!rtw_cfg80211_allow_ch_switch_notify(adapter)) + goto exit; +-- +Created with Armbian build tools https://github.com/armbian/build diff --git a/patch/misc/wireless-rtl8723du-Fix-uninitialized-cfg80211-chan-def.patch b/patch/misc/wireless-rtl8723du-Fix-uninitialized-cfg80211-chan-def.patch new file mode 100644 index 000000000..e9879c02d --- /dev/null +++ b/patch/misc/wireless-rtl8723du-Fix-uninitialized-cfg80211-chan-def.patch @@ -0,0 +1,25 @@ +From f8e116deb69b22fd056a121ee1d79fb8d7c490b8 Mon Sep 17 00:00:00 2001 +From: Kirill Zhumarin +Date: Thu, 19 Jan 2023 21:46:16 +0000 +Subject: [PATCH] Fix uninitialized cfg80211_chan_def + +Signed-off-by: Kirill Zhumarin +--- + drivers/net/wireless/rtl8723du/os_dep/ioctl_cfg80211.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/wireless/rtl8723du/os_dep/ioctl_cfg80211.c b/drivers/net/wireless/rtl8723du/os_dep/ioctl_cfg80211.c +index 64541a364..ba32bb013 100644 +--- a/drivers/net/wireless/rtl8723du/os_dep/ioctl_cfg80211.c ++++ b/drivers/net/wireless/rtl8723du/os_dep/ioctl_cfg80211.c +@@ -165,7 +165,7 @@ u8 rtw_cfg80211_ch_switch_notify(struct adapter *adapter, u8 ch, u8 bw, u8 offse + u8 ret = _SUCCESS; + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) +- struct cfg80211_chan_def chdef; ++ struct cfg80211_chan_def chdef = {}; + + ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht); + if (ret != _SUCCESS) +-- +Created with Armbian build tools https://github.com/armbian/build diff --git a/patch/misc/wireless-rtl8822bs-Fix-uninitialized-cfg80211-chan-def.patch b/patch/misc/wireless-rtl8822bs-Fix-uninitialized-cfg80211-chan-def.patch new file mode 100644 index 000000000..061923edb --- /dev/null +++ b/patch/misc/wireless-rtl8822bs-Fix-uninitialized-cfg80211-chan-def.patch @@ -0,0 +1,25 @@ +From f8e116deb69b22fd056a121ee1d79fb8d7c490b8 Mon Sep 17 00:00:00 2001 +From: Kirill Zhumarin +Date: Thu, 19 Jan 2023 21:46:16 +0000 +Subject: [PATCH] Fix uninitialized cfg80211_chan_def + +Signed-off-by: Kirill Zhumarin +--- + drivers/net/wireless/rtl8822bs/os_dep/linux/ioctl_cfg80211.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/wireless/rtl8822bs/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl8822bs/os_dep/linux/ioctl_cfg80211.c +index 23f9409e5..13c4cf0fe 100644 +--- a/drivers/net/wireless/rtl8822bs/os_dep/linux/ioctl_cfg80211.c ++++ b/drivers/net/wireless/rtl8822bs/os_dep/linux/ioctl_cfg80211.c +@@ -387,7 +387,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapter *adapter, u8 ch, u8 bw, u8 offset, u8 + u8 ret = _SUCCESS; + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) +- struct cfg80211_chan_def chdef; ++ struct cfg80211_chan_def chdef = {}; + + ret = rtw_chbw_to_cfg80211_chan_def(wiphy, &chdef, ch, bw, offset, ht); + if (ret != _SUCCESS) +-- +Created with Armbian build tools https://github.com/armbian/build