From: Eason Lai <eason.lai@mediatek.com>
To: <nbd@nbd.name>, <lorenzo@kernel.org>
Cc: <linux-wireless@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>, <kun.wu@mediatek.com>,
<deren.wu@mediatek.com>, <sean.wang@mediatek.com>,
<quan.zhou@mediatek.com>, <ryder.lee@mediatek.com>,
<leon.yen@mediatek.com>, <litien.chang@mediatek.com>,
<jb.tsai@mediatek.com>, <lucid_duck@justthetip.ca>,
<eason.lai@mediatek.com>, <stable@vger.kernel.org>
Subject: [PATCH v1 2/2] wifi: mt76: free a partial rx A-MSDU when the phy is unregistered
Date: Wed, 28 Oct 2026 10:10:53 +0800 [thread overview]
Message-ID: <20261028021053.2220951-3-eason.lai@mediatek.com> (raw)
In-Reply-To: <20261028021053.2220951-1-eason.lai@mediatek.com>
mt76_rx_release_burst() keeps the first subframes of an A-MSDU in
phy->rx_amsdu[q] until the last subframe arrives. If the phy or device
is unregistered in the meantime, nothing frees this skb and it leaks.
Free any parked A-MSDU after ieee80211_unregister_hw(), once rx has
stopped.
Fixes: cc4b3c139ad3 ("mt76: mt7915: enable hw rx-amsdu de-aggregation")
Signed-off-by: Eason Lai <eason.lai@mediatek.com>
---
drivers/net/wireless/mediatek/mt76/mac80211.c | 22 +++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 19a2e8a26c3e..fb8494ad8f8d 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -603,6 +603,19 @@ int mt76_register_phy(struct mt76_phy *phy, bool vht,
}
EXPORT_SYMBOL_GPL(mt76_register_phy);
+static void mt76_rx_amsdu_purge(struct mt76_phy *phy)
+{
+ int q;
+
+ for (q = 0; q < ARRAY_SIZE(phy->rx_amsdu); q++) {
+ spin_lock_bh(&phy->rx_amsdu[q].lock);
+ dev_kfree_skb(phy->rx_amsdu[q].head);
+ phy->rx_amsdu[q].head = NULL;
+ phy->rx_amsdu[q].tail = NULL;
+ spin_unlock_bh(&phy->rx_amsdu[q].lock);
+ }
+}
+
void mt76_unregister_phy(struct mt76_phy *phy)
{
struct mt76_dev *dev = phy->dev;
@@ -614,6 +627,7 @@ void mt76_unregister_phy(struct mt76_phy *phy)
mt76_led_cleanup(phy);
mt76_tx_status_check(dev, true);
ieee80211_unregister_hw(phy->hw);
+ mt76_rx_amsdu_purge(phy);
dev->phys[phy->band_idx] = NULL;
}
EXPORT_SYMBOL_GPL(mt76_unregister_phy);
@@ -811,6 +825,7 @@ EXPORT_SYMBOL_GPL(mt76_register_device);
void mt76_unregister_device(struct mt76_dev *dev)
{
struct ieee80211_hw *hw = dev->hw;
+ int i;
if (!test_bit(MT76_STATE_REGISTERED, &dev->phy.state))
return;
@@ -820,6 +835,13 @@ void mt76_unregister_device(struct mt76_dev *dev)
mt76_tx_status_check(dev, true);
mt76_wcid_cleanup(dev, &dev->global_wcid);
ieee80211_unregister_hw(hw);
+
+ /* radio phys sharing dev->hw (e.g. mt7996) are not unregistered
+ * separately
+ */
+ for (i = 0; i < ARRAY_SIZE(dev->phys); i++)
+ if (dev->phys[i])
+ mt76_rx_amsdu_purge(dev->phys[i]);
}
EXPORT_SYMBOL_GPL(mt76_unregister_device);
--
2.45.2
prev parent reply other threads:[~2026-10-28 2:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-28 2:10 [PATCH v1 0/2] wifi: mt76: Fix UAF and SKB leaks in RX A-MSDU path Eason Lai
2026-10-28 2:10 ` [PATCH v1 1/2] wifi: mt76: flush a partial rx A-MSDU when its station is removed Eason Lai
2026-10-28 2:10 ` Eason Lai [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261028021053.2220951-3-eason.lai@mediatek.com \
--to=eason.lai@mediatek.com \
--cc=deren.wu@mediatek.com \
--cc=jb.tsai@mediatek.com \
--cc=kun.wu@mediatek.com \
--cc=leon.yen@mediatek.com \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=litien.chang@mediatek.com \
--cc=lorenzo@kernel.org \
--cc=lucid_duck@justthetip.ca \
--cc=nbd@nbd.name \
--cc=quan.zhou@mediatek.com \
--cc=ryder.lee@mediatek.com \
--cc=sean.wang@mediatek.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox