From: Zhao Li <enderaoelyther@gmail.com>
To: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
Subject: [PATCH 3/3] wifi: iwlwifi: mld: unpublish links before freeing on add failure
Date: Mon, 14 Sep 2026 22:54:33 +0800 [thread overview]
Message-ID: <20260914145433.42830-4-enderaoelyther@gmail.com> (raw)
In-Reply-To: <20260914145433.42830-1-enderaoelyther@gmail.com>
During firmware restart, iwl_mld_add_link() can reuse a link that is
already published in mld_vif->link[]. If link initialization fails, the
common error path frees the link without clearing that pointer.
A later firmware-add failure does clear the pointer, but then immediately
frees the link while an RCU reader may still hold it.
Clear mld_vif->link[] in the common error path and defer freeing dynamic
links until after an RCU grace period, matching normal link removal.
iwl_mld_link_from_mac80211() reads that same slot under the wiphy mutex, so
a NULL link means the slot is already NULL; the common clear cannot discard
another link.
Fixes: d1e879ec600f ("wifi: iwlwifi: add iwlmld sub-driver")
Cc: stable@vger.kernel.org
Assisted-by: Codex:gpt-6-astra
Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
---
drivers/net/wireless/intel/iwlwifi/mld/link.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/link.c b/drivers/net/wireless/intel/iwlwifi/mld/link.c
index 96e06940b34c..55b84801923d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/link.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/link.c
@@ -541,15 +541,15 @@ int iwl_mld_add_link(struct iwl_mld *mld,
ret = iwl_mld_add_link_to_fw(mld, bss_conf);
if (ret) {
RCU_INIT_POINTER(mld->fw_id_to_bss_conf[link->fw_id], NULL);
- RCU_INIT_POINTER(mld_vif->link[bss_conf->link_id], NULL);
goto free;
}
return ret;
free:
+ RCU_INIT_POINTER(mld_vif->link[bss_conf->link_id], NULL);
if (!is_deflink)
- kfree(link);
+ kfree_rcu(link, rcu_head);
return ret;
}
--
2.55.0
prev parent reply other threads:[~2026-09-14 14:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-14 14:54 [PATCH 0/3] wifi: iwlwifi: fix RCU lifetime on setup failures Zhao Li
2026-09-14 14:54 ` [PATCH 1/3] wifi: iwlwifi: mvm: defer freeing PTK PN state on key failure Zhao Li
2026-09-14 14:54 ` [PATCH 2/3] wifi: iwlwifi: mld: " Zhao Li
2026-09-14 14:54 ` Zhao Li [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=20260914145433.42830-4-enderaoelyther@gmail.com \
--to=enderaoelyther@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=miriam.rachel.korenblit@intel.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
all inboxes | Powered by JetHome®