]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
mt76: mt7996: fix crash when using mesh 21643/head
authorHauke Mehrtens <hauke@hauke-m.de>
Thu, 22 Jan 2026 23:13:46 +0000 (00:13 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 25 Jan 2026 23:43:11 +0000 (00:43 +0100)
Backport a fix from upstream mt76 to fix a crash in 802.11s mesh mode.

Fixes: https://github.com/openwrt/openwrt/issues/20751
Link: https://github.com/openwrt/openwrt/pull/21643
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
package/kernel/mt76/patches/0002-wifi-mt76-mt7996-fix-crash-in-mt7996_tx_prepare_skb.patch [new file with mode: 0644]

diff --git a/package/kernel/mt76/patches/0002-wifi-mt76-mt7996-fix-crash-in-mt7996_tx_prepare_skb.patch b/package/kernel/mt76/patches/0002-wifi-mt76-mt7996-fix-crash-in-mt7996_tx_prepare_skb.patch
new file mode 100644 (file)
index 0000000..395fde3
--- /dev/null
@@ -0,0 +1,25 @@
+From f473d66ab595d5f37aedc868bfe407da0a1245c8 Mon Sep 17 00:00:00 2001
+From: Felix Fietkau <nbd@nbd.name>
+Date: Wed, 12 Nov 2025 16:32:44 +0000
+Subject: wifi: mt76: mt7996: fix crash in mt7996_tx_prepare_skb
+
+Add missing NULL pointer check. In mesh mode, sta can be NULL even for
+qosdata frames.
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+Upstream: https://github.com/openwrt/mt76/commit/f473d66ab595d5f37aedc868bfe407da0a1245c8
+---
+ mt7996/mac.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/mt7996/mac.c
++++ b/mt7996/mac.c
+@@ -1061,7 +1061,7 @@ int mt7996_tx_prepare_skb(struct mt76_de
+       if (!wcid)
+               wcid = &dev->mt76.global_wcid;
+-      if ((is_8023 || ieee80211_is_data_qos(hdr->frame_control)) && sta->mlo &&
++      if ((is_8023 || ieee80211_is_data_qos(hdr->frame_control)) && sta && sta->mlo &&
+           likely(tx_info->skb->protocol != cpu_to_be16(ETH_P_PAE))) {
+               u8 tid = tx_info->skb->priority & IEEE80211_QOS_CTL_TID_MASK;