]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: mt76: fix linked list corruption
authorFelix Fietkau <nbd@nbd.name>
Wed, 27 Aug 2025 08:53:52 +0000 (10:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Sep 2025 16:58:06 +0000 (18:58 +0200)
[ Upstream commit 49fba87205bec14a0f6bd997635bf3968408161e ]

Never leave scheduled wcid entries on the temporary on-stack list

Fixes: 0b3be9d1d34e ("wifi: mt76: add separate tx scheduling queue for off-channel tx")
Link: https://patch.msgid.link/20250827085352.51636-6-nbd@nbd.name
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/tx.c

index 5e081972bf445cf98338a38805247281fd4b5ee3..634b6dacd1e0d2f80ce498d54719347443250c4e 100644 (file)
@@ -645,6 +645,7 @@ mt76_txq_schedule_pending_wcid(struct mt76_phy *phy, struct mt76_wcid *wcid,
 static void mt76_txq_schedule_pending(struct mt76_phy *phy)
 {
        LIST_HEAD(tx_list);
+       int ret = 0;
 
        if (list_empty(&phy->tx_list))
                return;
@@ -656,13 +657,13 @@ static void mt76_txq_schedule_pending(struct mt76_phy *phy)
        list_splice_init(&phy->tx_list, &tx_list);
        while (!list_empty(&tx_list)) {
                struct mt76_wcid *wcid;
-               int ret;
 
                wcid = list_first_entry(&tx_list, struct mt76_wcid, tx_list);
                list_del_init(&wcid->tx_list);
 
                spin_unlock(&phy->tx_lock);
-               ret = mt76_txq_schedule_pending_wcid(phy, wcid, &wcid->tx_offchannel);
+               if (ret >= 0)
+                       ret = mt76_txq_schedule_pending_wcid(phy, wcid, &wcid->tx_offchannel);
                if (ret >= 0 && !phy->offchannel)
                        ret = mt76_txq_schedule_pending_wcid(phy, wcid, &wcid->tx_pending);
                spin_lock(&phy->tx_lock);
@@ -671,9 +672,6 @@ static void mt76_txq_schedule_pending(struct mt76_phy *phy)
                    !skb_queue_empty(&wcid->tx_offchannel) &&
                    list_empty(&wcid->tx_list))
                        list_add_tail(&wcid->tx_list, &phy->tx_list);
-
-               if (ret < 0)
-                       break;
        }
        spin_unlock(&phy->tx_lock);