A TX or RX path that looked up a wcid before the driver unpublished it can call mt76_tx() or mt76_wcid_add_poll() after mt76_wcid_cleanup(). This lists the wcid again, and where the driver frees the wcid after the cleanup, the TX worker or the poll later uses freed memory. Drop the frame and skip the poll for a wcid that dev->wcid[] no longer holds, like mt76_tx_status_skb_add() does for a TX status request. Both tests run under the lock that the cleanup takes to unlist the wcid. The global wcid lives as long as the device, and mt76x02 never publishes it, so its frames are always queued. mt7996 unpublishes a station link that it removes outside of a station removal only after the cleanup, so unpublish it before. Fixes: 0335c034e726 ("wifi: mt76: fix race condition related to checking tx queue fill status") Fixes: f520eceacd24 ("wifi: mt76: mt7996: Add mt7996_mac_sta_change_links callback") Signed-off-by: Felix Fietkau --- drivers/net/wireless/mediatek/mt76/mac80211.c | 3 ++- .../net/wireless/mediatek/mt76/mt7996/main.c | 4 +++- drivers/net/wireless/mediatek/mt76/tx.c | 20 +++++++++++++------ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index da1da160909a..12089dca01b2 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c @@ -1886,7 +1886,8 @@ void mt76_wcid_add_poll(struct mt76_dev *dev, struct mt76_wcid *wcid) return; spin_lock_bh(&dev->sta_poll_lock); - if (list_empty(&wcid->poll_list)) + if (rcu_access_pointer(dev->wcid[wcid->idx]) == wcid && + list_empty(&wcid->poll_list)) list_add_tail(&wcid->poll_list, &dev->sta_poll_list); spin_unlock_bh(&dev->sta_poll_lock); } diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c index 90a074ffa7dc..ba7a0553e34a 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c @@ -1385,6 +1385,9 @@ void mt7996_mac_sta_remove_link(struct mt7996_dev *dev, if (!msta_link) return; + if (flush) + rcu_assign_pointer(dev->mt76.wcid[msta_link->wcid.idx], NULL); + spin_lock_bh(&dev->mt76.sta_poll_lock); if (!list_empty(&msta_link->wcid.poll_list)) list_del_init(&msta_link->wcid.poll_list); @@ -1411,7 +1414,6 @@ void mt7996_mac_sta_remove_link(struct mt7996_dev *dev, phy->mt76->num_sta--; rcu_assign_pointer(msta->link[link_id], NULL); - rcu_assign_pointer(dev->mt76.wcid[msta_link->wcid.idx], NULL); mt76_wcid_mask_clear(dev->mt76.wcid_mask, msta_link->wcid.idx); if (msta_link != &msta->deflink) kfree_rcu(msta_link, rcu_head); diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c index 9eafc86ec288..84ab3d428001 100644 --- a/drivers/net/wireless/mediatek/mt76/tx.c +++ b/drivers/net/wireless/mediatek/mt76/tx.c @@ -365,6 +365,7 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta, { struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_hdr *hdr = (void *)skb->data; + struct mt76_dev *dev = phy->dev; struct sk_buff_head *head; if (mt76_testmode_enabled(phy)) { @@ -388,16 +389,23 @@ mt76_tx(struct mt76_phy *phy, struct ieee80211_sta *sta, else head = &wcid->tx_pending; - spin_lock_bh(&head->lock); - __skb_queue_tail(head, skb); - spin_unlock_bh(&head->lock); + spin_lock_bh(&dev->tx_lock); + if (wcid != &dev->global_wcid && + rcu_access_pointer(dev->wcid[wcid->idx]) != wcid) { + spin_unlock_bh(&dev->tx_lock); + ieee80211_free_txskb(phy->hw, skb); + return; + } + + spin_lock(&head->lock); + __skb_queue_tail(head, skb); + spin_unlock(&head->lock); - spin_lock_bh(&phy->dev->tx_lock); if (list_empty(&wcid->tx_list)) list_add_tail(&wcid->tx_list, &phy->tx_list); - spin_unlock_bh(&phy->dev->tx_lock); + spin_unlock_bh(&dev->tx_lock); - mt76_worker_schedule(&phy->dev->tx_worker); + mt76_worker_schedule(&dev->tx_worker); } EXPORT_SYMBOL_GPL(mt76_tx); -- 2.47.3