diff --git a/patches/6.12/87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch b/patches/6.12/87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch deleted file mode 100644 index 98bb609a..00000000 --- a/patches/6.12/87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 87b07a1fbc6b5c23d3b3584ab4288bc9106d3274 Mon Sep 17 00:00:00 2001 -From: Nathan Chancellor -Date: Tue, 15 Jul 2025 15:33:25 -0700 -Subject: wifi: mt76: mt7996: Initialize hdr before passing to skb_put_data() - -A new warning in clang [1] points out a couple of places where a hdr -variable is not initialized then passed along to skb_put_data(). - - drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:1894:21: warning: variable 'hdr' is uninitialized when passed as a const pointer argument here [-Wuninitialized-const-pointer] - 1894 | skb_put_data(skb, &hdr, sizeof(hdr)); - | ^~~ - drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:3386:21: warning: variable 'hdr' is uninitialized when passed as a const pointer argument here [-Wuninitialized-const-pointer] - 3386 | skb_put_data(skb, &hdr, sizeof(hdr)); - | ^~~ - -Zero initialize these headers as done in other places in the driver when -there is nothing stored in the header. - -Cc: stable@vger.kernel.org -Fixes: 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices") -Link: https://github.com/llvm/llvm-project/commit/00dacf8c22f065cb52efb14cd091d441f19b319e [1] -Closes: https://github.com/ClangBuiltLinux/linux/issues/2104 -Signed-off-by: Nathan Chancellor -Link: https://patch.msgid.link/20250715-mt7996-fix-uninit-const-pointer-v1-1-b5d8d11d7b78@kernel.org -Signed-off-by: Felix Fietkau ---- - drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c -index 3593fd40c51b6c..fe1b34386de232 100644 ---- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c -+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c -@@ -1879,8 +1879,8 @@ mt7996_mcu_get_mmps_mode(enum ieee80211_smps_mode smps) - int mt7996_mcu_set_fixed_rate_ctrl(struct mt7996_dev *dev, - void *data, u16 version) - { -+ struct uni_header hdr = {}; - struct ra_fixed_rate *req; -- struct uni_header hdr; - struct sk_buff *skb; - struct tlv *tlv; - int len; -@@ -3372,7 +3372,7 @@ int mt7996_mcu_set_hdr_trans(struct mt7996_dev *dev, bool hdr_trans) - { - struct { - u8 __rsv[4]; -- } __packed hdr; -+ } __packed hdr = {}; - struct hdr_trans_blacklist *req_blacklist; - struct hdr_trans_en *req_en; - struct sk_buff *skb; --- -cgit 1.2.3-korg - diff --git a/patches/6.12/series b/patches/6.12/series index 22989589..13045031 100644 --- a/patches/6.12/series +++ b/patches/6.12/series @@ -1,3 +1,2 @@ 0001-HACK-rtl8712-Zero-initialize-val-in-read_rfreg_hdl.patch 7fa37ba25a1dfc084e24ea9acc14bf1fad8af14c.patch -87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch diff --git a/patches/6.6/87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch b/patches/6.6/87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch deleted file mode 100644 index 98bb609a..00000000 --- a/patches/6.6/87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 87b07a1fbc6b5c23d3b3584ab4288bc9106d3274 Mon Sep 17 00:00:00 2001 -From: Nathan Chancellor -Date: Tue, 15 Jul 2025 15:33:25 -0700 -Subject: wifi: mt76: mt7996: Initialize hdr before passing to skb_put_data() - -A new warning in clang [1] points out a couple of places where a hdr -variable is not initialized then passed along to skb_put_data(). - - drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:1894:21: warning: variable 'hdr' is uninitialized when passed as a const pointer argument here [-Wuninitialized-const-pointer] - 1894 | skb_put_data(skb, &hdr, sizeof(hdr)); - | ^~~ - drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:3386:21: warning: variable 'hdr' is uninitialized when passed as a const pointer argument here [-Wuninitialized-const-pointer] - 3386 | skb_put_data(skb, &hdr, sizeof(hdr)); - | ^~~ - -Zero initialize these headers as done in other places in the driver when -there is nothing stored in the header. - -Cc: stable@vger.kernel.org -Fixes: 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices") -Link: https://github.com/llvm/llvm-project/commit/00dacf8c22f065cb52efb14cd091d441f19b319e [1] -Closes: https://github.com/ClangBuiltLinux/linux/issues/2104 -Signed-off-by: Nathan Chancellor -Link: https://patch.msgid.link/20250715-mt7996-fix-uninit-const-pointer-v1-1-b5d8d11d7b78@kernel.org -Signed-off-by: Felix Fietkau ---- - drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c -index 3593fd40c51b6c..fe1b34386de232 100644 ---- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c -+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c -@@ -1879,8 +1879,8 @@ mt7996_mcu_get_mmps_mode(enum ieee80211_smps_mode smps) - int mt7996_mcu_set_fixed_rate_ctrl(struct mt7996_dev *dev, - void *data, u16 version) - { -+ struct uni_header hdr = {}; - struct ra_fixed_rate *req; -- struct uni_header hdr; - struct sk_buff *skb; - struct tlv *tlv; - int len; -@@ -3372,7 +3372,7 @@ int mt7996_mcu_set_hdr_trans(struct mt7996_dev *dev, bool hdr_trans) - { - struct { - u8 __rsv[4]; -- } __packed hdr; -+ } __packed hdr = {}; - struct hdr_trans_blacklist *req_blacklist; - struct hdr_trans_en *req_en; - struct sk_buff *skb; --- -cgit 1.2.3-korg - diff --git a/patches/6.6/series b/patches/6.6/series index 8e4a0d5a..d2d4a560 100644 --- a/patches/6.6/series +++ b/patches/6.6/series @@ -1,3 +1,2 @@ 0001-HACK-rtl8712-Zero-initialize-val-in-read_rfreg_hdl.patch -87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch ccc35ff2fd2911986b716a87fe65e03fac2312c9.patch diff --git a/patches/stable/87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch b/patches/stable/87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch deleted file mode 100644 index 98bb609a..00000000 --- a/patches/stable/87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 87b07a1fbc6b5c23d3b3584ab4288bc9106d3274 Mon Sep 17 00:00:00 2001 -From: Nathan Chancellor -Date: Tue, 15 Jul 2025 15:33:25 -0700 -Subject: wifi: mt76: mt7996: Initialize hdr before passing to skb_put_data() - -A new warning in clang [1] points out a couple of places where a hdr -variable is not initialized then passed along to skb_put_data(). - - drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:1894:21: warning: variable 'hdr' is uninitialized when passed as a const pointer argument here [-Wuninitialized-const-pointer] - 1894 | skb_put_data(skb, &hdr, sizeof(hdr)); - | ^~~ - drivers/net/wireless/mediatek/mt76/mt7996/mcu.c:3386:21: warning: variable 'hdr' is uninitialized when passed as a const pointer argument here [-Wuninitialized-const-pointer] - 3386 | skb_put_data(skb, &hdr, sizeof(hdr)); - | ^~~ - -Zero initialize these headers as done in other places in the driver when -there is nothing stored in the header. - -Cc: stable@vger.kernel.org -Fixes: 98686cd21624 ("wifi: mt76: mt7996: add driver for MediaTek Wi-Fi 7 (802.11be) devices") -Link: https://github.com/llvm/llvm-project/commit/00dacf8c22f065cb52efb14cd091d441f19b319e [1] -Closes: https://github.com/ClangBuiltLinux/linux/issues/2104 -Signed-off-by: Nathan Chancellor -Link: https://patch.msgid.link/20250715-mt7996-fix-uninit-const-pointer-v1-1-b5d8d11d7b78@kernel.org -Signed-off-by: Felix Fietkau ---- - drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c -index 3593fd40c51b6c..fe1b34386de232 100644 ---- a/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c -+++ b/drivers/net/wireless/mediatek/mt76/mt7996/mcu.c -@@ -1879,8 +1879,8 @@ mt7996_mcu_get_mmps_mode(enum ieee80211_smps_mode smps) - int mt7996_mcu_set_fixed_rate_ctrl(struct mt7996_dev *dev, - void *data, u16 version) - { -+ struct uni_header hdr = {}; - struct ra_fixed_rate *req; -- struct uni_header hdr; - struct sk_buff *skb; - struct tlv *tlv; - int len; -@@ -3372,7 +3372,7 @@ int mt7996_mcu_set_hdr_trans(struct mt7996_dev *dev, bool hdr_trans) - { - struct { - u8 __rsv[4]; -- } __packed hdr; -+ } __packed hdr = {}; - struct hdr_trans_blacklist *req_blacklist; - struct hdr_trans_en *req_en; - struct sk_buff *skb; --- -cgit 1.2.3-korg - diff --git a/patches/stable/series b/patches/stable/series index 9422882b..250c20f7 100644 --- a/patches/stable/series +++ b/patches/stable/series @@ -1,2 +1 @@ 7fa37ba25a1dfc084e24ea9acc14bf1fad8af14c.patch -87b07a1fbc6b5c23d3b3584ab4288bc9106d3274.patch