From: Felix Fietkau <nbd@nbd.name>
To: linux-wireless@vger.kernel.org
Subject: [PATCH mt76-next 14/20] wifi: mt76: mt792x: handle all interfaces of a channel context
Date: Fri, 20 Nov 2026 18:44:53 +0100 [thread overview]
Message-ID: <20261120174459.1657382-14-nbd@nbd.name> (raw)
In-Reply-To: <20261120174459.1657382-1-nbd@nbd.name>
Since commit f3898da2e86e ("wifi: mt76: mt792x: add struct
mt792x_chanctx"), a channel context records only the link that was
assigned to it last. Removing any link clears the record, but a switch
of the recorded link to another context leaves it in place. A bandwidth
change of a context that a station and an AP share thus reaches the
firmware for at most one of them. After such a switch and the removal of
that link, the next change of the old context is a use after free.
Walk the active interfaces when a channel context changes, as the
driver did before that commit.
Fixes: f3898da2e86e ("wifi: mt76: mt792x: add struct mt792x_chanctx")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
.../net/wireless/mediatek/mt76/mt7921/main.c | 28 +++----
.../net/wireless/mediatek/mt76/mt7925/main.c | 83 +++++++++----------
drivers/net/wireless/mediatek/mt76/mt792x.h | 4 -
.../net/wireless/mediatek/mt76/mt792x_core.c | 5 --
4 files changed, 53 insertions(+), 67 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 6207a875996c..a89b4c7f2239 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -1413,25 +1413,25 @@ mt7921_change_chanctx(struct ieee80211_hw *hw,
struct ieee80211_chanctx_conf *ctx,
u32 changed)
{
- struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx->drv_priv;
struct mt792x_phy *phy = mt792x_hw_phy(hw);
struct ieee80211_vif *vif;
- struct mt792x_vif *mvif;
-
- if (!mctx->bss_conf)
- return;
-
- mvif = container_of(mctx->bss_conf, struct mt792x_vif, bss_conf);
- vif = container_of((void *)mvif, struct ieee80211_vif, drv_priv);
mt792x_mutex_acquire(phy->dev);
- if (vif->type == NL80211_IFTYPE_MONITOR) {
- mt7921_mcu_set_sniffer(mvif->phy->dev, vif, true);
- mt7921_mcu_config_sniffer(mvif, ctx);
- } else {
- mt76_connac_mcu_uni_set_chctx(mvif->phy->mt76, &mvif->bss_conf.mt76, ctx);
+ for_each_active_interface(vif, hw) {
+ struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+
+ if (mvif->bss_conf.mt76.ctx != ctx)
+ continue;
+
+ if (vif->type == NL80211_IFTYPE_MONITOR) {
+ mt7921_mcu_set_sniffer(mvif->phy->dev, vif, true);
+ mt7921_mcu_config_sniffer(mvif, ctx);
+ } else {
+ mt76_connac_mcu_uni_set_chctx(mvif->phy->mt76,
+ &mvif->bss_conf.mt76, ctx);
+ }
+ mt76_phy_chandef_set(mvif->phy->mt76, &ctx->def);
}
- mt76_phy_chandef_set(mvif->phy->mt76, &ctx->def);
mt792x_mutex_release(phy->dev);
}
diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index f8ad3bd16931..bd5375705e98 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -2287,58 +2287,57 @@ mt7925_remove_chanctx(struct ieee80211_hw *hw,
}
static void
-mt7925_change_chanctx(struct ieee80211_hw *hw,
- struct ieee80211_chanctx_conf *ctx,
- u32 changed)
+mt7925_link_change_chanctx(struct ieee80211_vif *vif,
+ struct mt792x_bss_conf *mconf,
+ struct ieee80211_chanctx_conf *ctx, u32 changed)
{
- struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx->drv_priv;
- struct mt792x_phy *phy = mt792x_hw_phy(hw);
- struct mt792x_bss_conf *mconf;
- struct ieee80211_vif *vif;
- struct mt792x_vif *mvif;
+ struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+ struct ieee80211_bss_conf *link_conf;
- if (!mctx->bss_conf)
+ if (!mconf || mconf->mt76.ctx != ctx)
return;
- mconf = mctx->bss_conf;
- mvif = mconf->vif;
- vif = container_of((void *)mvif, struct ieee80211_vif, drv_priv);
-
- mt792x_mutex_acquire(phy->dev);
if (vif->type == NL80211_IFTYPE_MONITOR) {
mt7925_mcu_set_sniffer(mvif->phy->dev, vif, true);
mt7925_mcu_config_sniffer(mvif, ctx);
} else {
- if (ieee80211_vif_is_mld(vif)) {
- unsigned long valid = mvif->valid_links;
- u8 i;
+ link_conf = mt792x_vif_to_bss_conf(vif, mconf->link_id);
+ if (mt7925_p2p_chanctx_bss_programmed(vif, link_conf))
+ mt7925_mcu_set_chctx(mvif->phy->mt76, &mconf->mt76,
+ link_conf, ctx);
- for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS) {
- mconf = mt792x_vif_to_link(mvif, i);
- if (mconf && mconf->mt76.ctx == ctx)
- break;
- }
-
- } else {
- mconf = &mvif->bss_conf;
- }
-
- if (mconf) {
- struct ieee80211_bss_conf *link_conf;
-
- link_conf = mt792x_vif_to_bss_conf(vif, mconf->link_id);
-
- if (mt7925_p2p_chanctx_bss_programmed(vif, link_conf))
- mt7925_mcu_set_chctx(mvif->phy->mt76, &mconf->mt76,
- link_conf, ctx);
-
- if (changed & IEEE80211_CHANCTX_CHANGE_PUNCTURING)
- mt7925_mcu_set_eht_pp(mvif->phy->mt76, &mconf->mt76,
- link_conf, ctx);
- }
+ if (changed & IEEE80211_CHANCTX_CHANGE_PUNCTURING)
+ mt7925_mcu_set_eht_pp(mvif->phy->mt76, &mconf->mt76,
+ link_conf, ctx);
}
mt76_phy_chandef_set(mvif->phy->mt76, &ctx->def);
+}
+static void
+mt7925_change_chanctx(struct ieee80211_hw *hw,
+ struct ieee80211_chanctx_conf *ctx,
+ u32 changed)
+{
+ struct mt792x_phy *phy = mt792x_hw_phy(hw);
+ struct ieee80211_vif *vif;
+
+ mt792x_mutex_acquire(phy->dev);
+ for_each_active_interface(vif, hw) {
+ struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
+ unsigned long valid = mvif->valid_links;
+ u8 i;
+
+ if (!ieee80211_vif_is_mld(vif)) {
+ mt7925_link_change_chanctx(vif, &mvif->bss_conf, ctx,
+ changed);
+ continue;
+ }
+
+ for_each_set_bit(i, &valid, IEEE80211_MLD_MAX_NUM_LINKS)
+ mt7925_link_change_chanctx(vif,
+ mt792x_vif_to_link(mvif, i),
+ ctx, changed);
+ }
mt792x_mutex_release(phy->dev);
}
@@ -2755,7 +2754,6 @@ static int mt7925_assign_vif_chanctx(struct ieee80211_hw *hw,
struct ieee80211_bss_conf *link_conf,
struct ieee80211_chanctx_conf *ctx)
{
- struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx->drv_priv;
struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
struct mt792x_dev *dev = mt792x_hw_dev(hw);
struct ieee80211_bss_conf *pri_link_conf;
@@ -2783,7 +2781,6 @@ static int mt7925_assign_vif_chanctx(struct ieee80211_hw *hw,
}
mconf->mt76.ctx = ctx;
- mctx->bss_conf = mconf;
mt76_phy_chandef_set(mvif->phy->mt76, &ctx->def);
mutex_unlock(&dev->mt76.mutex);
@@ -2795,7 +2792,6 @@ static void mt7925_unassign_vif_chanctx(struct ieee80211_hw *hw,
struct ieee80211_bss_conf *link_conf,
struct ieee80211_chanctx_conf *ctx)
{
- struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx->drv_priv;
struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
struct mt792x_dev *dev = mt792x_hw_dev(hw);
struct mt792x_bss_conf *mconf;
@@ -2813,7 +2809,6 @@ static void mt7925_unassign_vif_chanctx(struct ieee80211_hw *hw,
mconf = &mvif->bss_conf;
}
- mctx->bss_conf = NULL;
mconf->mt76.ctx = NULL;
mutex_unlock(&dev->mt76.mutex);
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 8dfe10cbb6d1..e37d901575e5 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -163,10 +163,6 @@ struct mt792x_sta {
DECLARE_EWMA(rssi, 10, 8);
-struct mt792x_chanctx {
- struct mt792x_bss_conf *bss_conf;
-};
-
struct mt792x_bss_conf {
struct mt76_vif_link mt76; /* must be first */
struct mt792x_vif *vif;
diff --git a/drivers/net/wireless/mediatek/mt76/mt792x_core.c b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
index 2d39f18f4d43..5743c5437863 100644
--- a/drivers/net/wireless/mediatek/mt76/mt792x_core.c
+++ b/drivers/net/wireless/mediatek/mt76/mt792x_core.c
@@ -503,13 +503,11 @@ int mt792x_assign_vif_chanctx(struct ieee80211_hw *hw,
struct ieee80211_bss_conf *link_conf,
struct ieee80211_chanctx_conf *ctx)
{
- struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx->drv_priv;
struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
struct mt792x_dev *dev = mt792x_hw_dev(hw);
mutex_lock(&dev->mt76.mutex);
mvif->bss_conf.mt76.ctx = ctx;
- mctx->bss_conf = &mvif->bss_conf;
mt76_phy_chandef_set(&dev->mphy, &ctx->def);
mutex_unlock(&dev->mt76.mutex);
@@ -522,12 +520,10 @@ void mt792x_unassign_vif_chanctx(struct ieee80211_hw *hw,
struct ieee80211_bss_conf *link_conf,
struct ieee80211_chanctx_conf *ctx)
{
- struct mt792x_chanctx *mctx = (struct mt792x_chanctx *)ctx->drv_priv;
struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
struct mt792x_dev *dev = mt792x_hw_dev(hw);
mutex_lock(&dev->mt76.mutex);
- mctx->bss_conf = NULL;
mvif->bss_conf.mt76.ctx = NULL;
mutex_unlock(&dev->mt76.mutex);
@@ -810,7 +806,6 @@ int mt792x_init_wiphy(struct ieee80211_hw *hw)
hw->sta_data_size = sizeof(struct mt792x_sta);
hw->vif_data_size = sizeof(struct mt792x_vif);
- hw->chanctx_data_size = sizeof(struct mt792x_chanctx);
if (dev->fw_features & MT792x_FW_CAP_CNM)
wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
--
2.47.3
next prev parent reply other threads:[~2026-11-20 17:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 17:44 [PATCH mt76-next 01/20] wifi: mt76: mt7925: free the vif links when all links go Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 02/20] wifi: mt76: mt7925: free removed vif links after an RCU grace period Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 03/20] wifi: mt76: remove a replayed station from the driver before the add Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 04/20] wifi: mt76: mt7925: run the reset link replay under the wiphy lock Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 05/20] wifi: mt76: mt7925: take the mutex before the link_info_changed lookup Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 06/20] wifi: mt76: mt7925: hold the mutex for the link lookup in conf_tx Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 07/20] wifi: mt76: mt7925: skip a polled link without a station Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 08/20] wifi: mt76: mt7925: skip a link without a link conf in the MLO PS update Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 09/20] wifi: mt76: mt7925: restore the beacon filter when monitor mode ends Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 10/20] wifi: mt76: usb: do not park the TX worker again under MT76_RESET Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 11/20] wifi: mt76: mt7925: keep the default link in the active links Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 12/20] wifi: mt76: mt7925: read the monitor state under the mutex for deep sleep Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 13/20] wifi: mt76: clear roc_link before the ROC link is freed Felix Fietkau
2026-11-20 17:44 ` Felix Fietkau [this message]
2026-11-20 17:44 ` [PATCH mt76-next 15/20] wifi: mt76: mt792x: set up the sniffer when a monitor gets its channel Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 16/20] wifi: mt76: buffer Disassociation frames for stations in power save Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 17/20] wifi: mt76: mt7921: read the monitor state under the mutex for deep sleep Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 18/20] wifi: mt76: mt7925: wake the device to unassign a channel context Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 19/20] wifi: mt76: mt7996: keep the firmware log settings across a reload Felix Fietkau
2026-11-20 17:44 ` [PATCH mt76-next 20/20] wifi: mt76: mt7915: " Felix Fietkau
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=20261120174459.1657382-14-nbd@nbd.name \
--to=nbd@nbd.name \
--cc=linux-wireless@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