* [PATCH wireless v2 1/4] wifi: nxpwifi: cancel channel switch work on teardown
2026-11-18 18:35 [PATCH wireless v2 0/4] wifi: nxpwifi: fix AP channel-switch lifetime and failures Zhao Li
@ 2026-11-18 18:35 ` Zhao Li
2026-11-18 18:35 ` [PATCH wireless v2 2/4] wifi: nxpwifi: stop AP TX after preparing channel switch Zhao Li
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Zhao Li @ 2026-11-18 18:35 UTC (permalink / raw)
To: Jeff Chen
Cc: Jeff Chen, Francesco Dolcini, Johannes Berg, Arend van Spriel,
Jiangshan Yi, Linmao Li, Kees Cook, Rosen Penev, Benjamin Berg,
linux-wireless, linux-kernel, stable, Zhao Li
Stopping an AP while channel-switch work is pending leaves the delayed
work armed, and the callback later runs on an AP that is gone, or on
freed driver state after removal.
Cancel the work when the AP stops, and clear uap_stop_tx, which a
pending switch with block_tx has set. Interface deletion, type changes
and driver removal all stop a running AP first.
Found by code review. Compile-tested with W=1.
Fixes: 73b01e57ed3e ("wifi: nxp: add nxpwifi driver for IW61x")
Cc: stable@vger.kernel.org
Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
---
No new W=1, sparse or smatch warnings.
AI assistance was used.
drivers/net/wireless/nxp/nxpwifi/cfg80211.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/nxp/nxpwifi/cfg80211.c b/drivers/net/wireless/nxp/nxpwifi/cfg80211.c
index ba54078b082c..5b8fb37c3f3d 100644
--- a/drivers/net/wireless/nxp/nxpwifi/cfg80211.c
+++ b/drivers/net/wireless/nxp/nxpwifi/cfg80211.c
@@ -1639,6 +1639,8 @@ static int nxpwifi_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,
struct nxpwifi_private *priv = nxpwifi_netdev_get_priv(dev);
int ret;
+ wiphy_delayed_work_cancel(wiphy, &priv->dfs_chan_sw_work);
+ priv->uap_stop_tx = false;
nxpwifi_abort_cac(priv);
if (nxpwifi_del_mgmt_ies(priv))
--
2.56.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH wireless v2 2/4] wifi: nxpwifi: stop AP TX after preparing channel switch
2026-11-18 18:35 [PATCH wireless v2 0/4] wifi: nxpwifi: fix AP channel-switch lifetime and failures Zhao Li
2026-11-18 18:35 ` [PATCH wireless v2 1/4] wifi: nxpwifi: cancel channel switch work on teardown Zhao Li
@ 2026-11-18 18:35 ` Zhao Li
2026-11-18 18:35 ` [PATCH wireless v2 3/4] wifi: nxpwifi: own beacon data used by channel switch work Zhao Li
2026-11-18 18:35 ` [PATCH wireless v2 4/4] wifi: nxpwifi: stop AP when delayed channel switch fails Zhao Li
3 siblings, 0 replies; 5+ messages in thread
From: Zhao Li @ 2026-11-18 18:35 UTC (permalink / raw)
To: Jeff Chen
Cc: Jeff Chen, Francesco Dolcini, Johannes Berg, Arend van Spriel,
Jiangshan Yi, Linmao Li, Kees Cook, Rosen Penev, Benjamin Berg,
linux-wireless, linux-kernel, stable, Zhao Li
A channel switch with block_tx set disables the carrier and TX queues
before the CSA management IEs are installed. If installing them fails,
the request is rejected but TX stays stopped.
Stop TX only after the IEs are installed.
Found by code review. Compile-tested with W=1.
Fixes: 73b01e57ed3e ("wifi: nxp: add nxpwifi driver for IW61x")
Cc: stable@vger.kernel.org
Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
---
No new W=1, sparse or smatch warnings.
AI assistance was used.
drivers/net/wireless/nxp/nxpwifi/cfg80211.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/nxp/nxpwifi/cfg80211.c b/drivers/net/wireless/nxp/nxpwifi/cfg80211.c
index 5b8fb37c3f3d..a9cee7e602f0 100644
--- a/drivers/net/wireless/nxp/nxpwifi/cfg80211.c
+++ b/drivers/net/wireless/nxp/nxpwifi/cfg80211.c
@@ -3117,12 +3117,6 @@ nxpwifi_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
&priv->dfs_chandef))
return -EINVAL;
- if (params->block_tx) {
- netif_carrier_off(priv->netdev);
- nxpwifi_stop_net_dev_queue(priv->netdev, priv->adapter);
- priv->uap_stop_tx = true;
- }
-
ret = nxpwifi_del_mgmt_ies(priv);
if (ret)
nxpwifi_dbg(priv->adapter, ERROR,
@@ -3139,6 +3133,12 @@ nxpwifi_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
memcpy(&priv->ap_update_info.beacon, ¶ms->beacon_after,
sizeof(priv->ap_update_info.beacon));
+ if (params->block_tx) {
+ netif_carrier_off(priv->netdev);
+ nxpwifi_stop_net_dev_queue(priv->netdev, priv->adapter);
+ priv->uap_stop_tx = true;
+ }
+
chsw_msec = max(params->count * priv->bss_cfg.beacon_period, 100);
nxpwifi_queue_delayed_wiphy_work(priv->adapter,
--
2.56.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH wireless v2 3/4] wifi: nxpwifi: own beacon data used by channel switch work
2026-11-18 18:35 [PATCH wireless v2 0/4] wifi: nxpwifi: fix AP channel-switch lifetime and failures Zhao Li
2026-11-18 18:35 ` [PATCH wireless v2 1/4] wifi: nxpwifi: cancel channel switch work on teardown Zhao Li
2026-11-18 18:35 ` [PATCH wireless v2 2/4] wifi: nxpwifi: stop AP TX after preparing channel switch Zhao Li
@ 2026-11-18 18:35 ` Zhao Li
2026-11-18 18:35 ` [PATCH wireless v2 4/4] wifi: nxpwifi: stop AP when delayed channel switch fails Zhao Li
3 siblings, 0 replies; 5+ messages in thread
From: Zhao Li @ 2026-11-18 18:35 UTC (permalink / raw)
To: Jeff Chen
Cc: Jeff Chen, Francesco Dolcini, Johannes Berg, Arend van Spriel,
Jiangshan Yi, Linmao Li, Kees Cook, Rosen Penev, Benjamin Berg,
linux-wireless, linux-kernel, stable, Zhao Li
The channel-switch work reads the new beacon data after the cfg80211
callback has returned, but the driver keeps only pointers into the
request, which can be freed by then. The IE parser then reads freed
memory.
Copy the beacon buffers used by nxpwifi_set_mgmt_ies() into an owned
cfg80211_ap_update. Free it when the work finishes or is canceled, and
return -EBUSY while a switch is pending.
Found by code review. Compile-tested with W=1.
Fixes: 73b01e57ed3e ("wifi: nxp: add nxpwifi driver for IW61x")
Cc: stable@vger.kernel.org
Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
---
No new W=1, sparse or smatch warnings.
AI assistance was used.
drivers/net/wireless/nxp/nxpwifi/11h.c | 14 +++--
drivers/net/wireless/nxp/nxpwifi/cfg80211.c | 60 ++++++++++++++++++++-
drivers/net/wireless/nxp/nxpwifi/main.h | 2 +-
3 files changed, 68 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/nxp/nxpwifi/11h.c b/drivers/net/wireless/nxp/nxpwifi/11h.c
index 058c319ff910..a6c87dfad9ee 100644
--- a/drivers/net/wireless/nxp/nxpwifi/11h.c
+++ b/drivers/net/wireless/nxp/nxpwifi/11h.c
@@ -301,21 +301,21 @@ void nxpwifi_dfs_chan_sw_work(struct wiphy *wiphy, struct wiphy_work *work)
if (!bss_cfg->beacon_period) {
nxpwifi_dbg(adapter, ERROR,
"channel switch: AP already stopped\n");
- return;
+ goto out;
}
if (nxpwifi_send_cmd(priv, HOST_CMD_UAP_BSS_STOP,
HOST_ACT_GEN_SET, 0, NULL, true)) {
nxpwifi_dbg(adapter, ERROR,
"channel switch: Failed to stop the BSS\n");
- return;
+ goto out;
}
if (nxpwifi_cfg80211_change_beacon(adapter->wiphy, priv->netdev,
- &priv->ap_update_info)) {
+ priv->ap_update_info)) {
nxpwifi_dbg(adapter, ERROR,
"channel switch: Failed to set beacon\n");
- return;
+ goto out;
}
nxpwifi_uap_set_channel(priv, bss_cfg, priv->dfs_chandef);
@@ -323,7 +323,7 @@ void nxpwifi_dfs_chan_sw_work(struct wiphy *wiphy, struct wiphy_work *work)
if (nxpwifi_config_start_uap(priv, bss_cfg)) {
nxpwifi_dbg(adapter, ERROR,
"Failed to start AP after channel switch\n");
- return;
+ goto out;
}
nxpwifi_dbg(adapter, MSG,
@@ -336,4 +336,8 @@ void nxpwifi_dfs_chan_sw_work(struct wiphy *wiphy, struct wiphy_work *work)
nxpwifi_wake_up_net_dev_queue(priv->netdev, adapter);
priv->uap_stop_tx = false;
}
+
+out:
+ kfree(priv->ap_update_info);
+ priv->ap_update_info = NULL;
}
diff --git a/drivers/net/wireless/nxp/nxpwifi/cfg80211.c b/drivers/net/wireless/nxp/nxpwifi/cfg80211.c
index a9cee7e602f0..e42f0f9b61dd 100644
--- a/drivers/net/wireless/nxp/nxpwifi/cfg80211.c
+++ b/drivers/net/wireless/nxp/nxpwifi/cfg80211.c
@@ -1641,6 +1641,8 @@ static int nxpwifi_cfg80211_stop_ap(struct wiphy *wiphy, struct net_device *dev,
wiphy_delayed_work_cancel(wiphy, &priv->dfs_chan_sw_work);
priv->uap_stop_tx = false;
+ kfree(priv->ap_update_info);
+ priv->ap_update_info = NULL;
nxpwifi_abort_cac(priv);
if (nxpwifi_del_mgmt_ies(priv))
@@ -3068,6 +3070,52 @@ static int nxpwifi_cfg80211_set_coalesce(struct wiphy *wiphy,
return nxpwifi_coalesce_cfg(priv, &coalesce_cfg);
}
+/* Keep only the beacon buffers consumed by nxpwifi_set_mgmt_ies(). */
+static struct cfg80211_ap_update *
+nxpwifi_dup_csa_update(const struct cfg80211_beacon_data *beacon)
+{
+ struct cfg80211_ap_update *update;
+ struct cfg80211_beacon_data *copy;
+ size_t len;
+ u8 *pos;
+
+ /* Each length comes from a bounded netlink attribute. */
+ len = beacon->tail_len + beacon->beacon_ies_len +
+ beacon->proberesp_ies_len + beacon->assocresp_ies_len;
+
+ update = kzalloc(sizeof(*update) + len, GFP_KERNEL);
+ if (!update)
+ return NULL;
+
+ copy = &update->beacon;
+ pos = (u8 *)(update + 1);
+ if (beacon->tail_len) {
+ copy->tail = pos;
+ copy->tail_len = beacon->tail_len;
+ memcpy(pos, beacon->tail, beacon->tail_len);
+ pos += beacon->tail_len;
+ }
+ if (beacon->beacon_ies_len) {
+ copy->beacon_ies = pos;
+ copy->beacon_ies_len = beacon->beacon_ies_len;
+ memcpy(pos, beacon->beacon_ies, beacon->beacon_ies_len);
+ pos += beacon->beacon_ies_len;
+ }
+ if (beacon->proberesp_ies_len) {
+ copy->proberesp_ies = pos;
+ copy->proberesp_ies_len = beacon->proberesp_ies_len;
+ memcpy(pos, beacon->proberesp_ies, beacon->proberesp_ies_len);
+ pos += beacon->proberesp_ies_len;
+ }
+ if (beacon->assocresp_ies_len) {
+ copy->assocresp_ies = pos;
+ copy->assocresp_ies_len = beacon->assocresp_ies_len;
+ memcpy(pos, beacon->assocresp_ies, beacon->assocresp_ies_len);
+ }
+
+ return update;
+}
+
static int
nxpwifi_cfg80211_uap_add_station(struct nxpwifi_private *priv, const u8 *mac,
struct station_parameters *params)
@@ -3101,9 +3149,13 @@ nxpwifi_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_csa_settings *params)
{
struct nxpwifi_private *priv = nxpwifi_netdev_get_priv(dev);
+ struct cfg80211_ap_update *update;
int chsw_msec;
int ret;
+ if (priv->ap_update_info)
+ return -EBUSY;
+
if (priv->adapter->scan_processing) {
nxpwifi_dbg(priv->adapter, ERROR,
"radar detection: scan in process...\n");
@@ -3117,6 +3169,10 @@ nxpwifi_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
&priv->dfs_chandef))
return -EINVAL;
+ update = nxpwifi_dup_csa_update(¶ms->beacon_after);
+ if (!update)
+ return -ENOMEM;
+
ret = nxpwifi_del_mgmt_ies(priv);
if (ret)
nxpwifi_dbg(priv->adapter, ERROR,
@@ -3126,12 +3182,12 @@ nxpwifi_cfg80211_channel_switch(struct wiphy *wiphy, struct net_device *dev,
if (ret) {
nxpwifi_dbg(priv->adapter, ERROR,
"%s: setting mgmt ies failed\n", __func__);
+ kfree(update);
goto done;
}
memcpy(&priv->dfs_chandef, ¶ms->chandef, sizeof(priv->dfs_chandef));
- memcpy(&priv->ap_update_info.beacon, ¶ms->beacon_after,
- sizeof(priv->ap_update_info.beacon));
+ priv->ap_update_info = update;
if (params->block_tx) {
netif_carrier_off(priv->netdev);
diff --git a/drivers/net/wireless/nxp/nxpwifi/main.h b/drivers/net/wireless/nxp/nxpwifi/main.h
index b25a6a4f2936..4d5718ed5031 100644
--- a/drivers/net/wireless/nxp/nxpwifi/main.h
+++ b/drivers/net/wireless/nxp/nxpwifi/main.h
@@ -619,7 +619,7 @@ struct nxpwifi_private {
struct wiphy_delayed_work dfs_cac_work;
struct wiphy_delayed_work dfs_chan_sw_work;
bool uap_stop_tx;
- struct cfg80211_ap_update ap_update_info;
+ struct cfg80211_ap_update *ap_update_info;
struct nxpwifi_11h_intf_state state_11h;
struct nxpwifi_ds_mem_rw mem_rw;
struct sk_buff_head bypass_txq;
--
2.56.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH wireless v2 4/4] wifi: nxpwifi: stop AP when delayed channel switch fails
2026-11-18 18:35 [PATCH wireless v2 0/4] wifi: nxpwifi: fix AP channel-switch lifetime and failures Zhao Li
` (2 preceding siblings ...)
2026-11-18 18:35 ` [PATCH wireless v2 3/4] wifi: nxpwifi: own beacon data used by channel switch work Zhao Li
@ 2026-11-18 18:35 ` Zhao Li
3 siblings, 0 replies; 5+ messages in thread
From: Zhao Li @ 2026-11-18 18:35 UTC (permalink / raw)
To: Jeff Chen
Cc: Jeff Chen, Francesco Dolcini, Johannes Berg, Arend van Spriel,
Jiangshan Yi, Linmao Li, Kees Cook, Rosen Penev, Benjamin Berg,
linux-wireless, linux-kernel, stable, Zhao Li
The delayed channel-switch work can fail while stopping the BSS, setting
the beacon or restarting the AP. It then returns without telling
cfg80211, and TX stays enabled over the stopped BSS unless the request
set block_tx.
On each failure, stop the carrier and TX queues, clear uap_stop_tx and
request interface shutdown, then free the beacon update as on success.
Found by code review. Compile-tested with W=1.
Fixes: 73b01e57ed3e ("wifi: nxp: add nxpwifi driver for IW61x")
Cc: stable@vger.kernel.org
Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
---
No new W=1, sparse or smatch warnings.
AI assistance was used.
drivers/net/wireless/nxp/nxpwifi/11h.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/nxp/nxpwifi/11h.c b/drivers/net/wireless/nxp/nxpwifi/11h.c
index a6c87dfad9ee..d83f36b1c8a5 100644
--- a/drivers/net/wireless/nxp/nxpwifi/11h.c
+++ b/drivers/net/wireless/nxp/nxpwifi/11h.c
@@ -300,22 +300,22 @@ void nxpwifi_dfs_chan_sw_work(struct wiphy *wiphy, struct wiphy_work *work)
bss_cfg = &priv->bss_cfg;
if (!bss_cfg->beacon_period) {
nxpwifi_dbg(adapter, ERROR,
- "channel switch: AP already stopped\n");
- goto out;
+ "channel switch: AP configuration is missing\n");
+ goto stop_iface;
}
if (nxpwifi_send_cmd(priv, HOST_CMD_UAP_BSS_STOP,
HOST_ACT_GEN_SET, 0, NULL, true)) {
nxpwifi_dbg(adapter, ERROR,
"channel switch: Failed to stop the BSS\n");
- goto out;
+ goto stop_iface;
}
if (nxpwifi_cfg80211_change_beacon(adapter->wiphy, priv->netdev,
priv->ap_update_info)) {
nxpwifi_dbg(adapter, ERROR,
"channel switch: Failed to set beacon\n");
- goto out;
+ goto stop_iface;
}
nxpwifi_uap_set_channel(priv, bss_cfg, priv->dfs_chandef);
@@ -323,7 +323,7 @@ void nxpwifi_dfs_chan_sw_work(struct wiphy *wiphy, struct wiphy_work *work)
if (nxpwifi_config_start_uap(priv, bss_cfg)) {
nxpwifi_dbg(adapter, ERROR,
"Failed to start AP after channel switch\n");
- goto out;
+ goto stop_iface;
}
nxpwifi_dbg(adapter, MSG,
@@ -337,6 +337,13 @@ void nxpwifi_dfs_chan_sw_work(struct wiphy *wiphy, struct wiphy_work *work)
priv->uap_stop_tx = false;
}
+ goto out;
+
+stop_iface:
+ netif_carrier_off(priv->netdev);
+ nxpwifi_stop_net_dev_queue(priv->netdev, adapter);
+ priv->uap_stop_tx = false;
+ cfg80211_stop_iface(wiphy, &priv->wdev, GFP_KERNEL);
out:
kfree(priv->ap_update_info);
priv->ap_update_info = NULL;
--
2.56.1
^ permalink raw reply related [flat|nested] 5+ messages in thread