From: Joas Antonio dos Santos via B4 Relay <devnull+joasantonio108.gmail.com@kernel.org>
To: Johannes Berg <johannes@sipsolutions.net>,
Benjamin Berg <benjamin.berg@intel.com>,
joasantonio108@gmail.com
Cc: linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH wireless v2] wifi: mac80211: check for a NULL link in the MLD station RX loop
Date: Mon, 16 Nov 2026 19:37:03 +0000 [thread overview]
Message-ID: <20261116-mac80211-rx-null-link-v2-1-ea512ae98139@gmail.com> (raw)
From: Joas Antonio dos Santos <joasantonio108@gmail.com>
Since commit 6d531b9af16e ("wifi: mac80211: rework RX packet handling"),
__ieee80211_rx_handle_packet() looks up the link of each MLD station
that matches addr2 and passes it straight to ieee80211_rx_valid_freq(),
which dereferences link->sdata and link->conf whenever status->freq is
set. The non-MLD loop and the interface loop below it check the link,
this one does not.
The link can be NULL there. ieee80211_vif_update_links() clears
sdata->link[link_id] for a removed link first, and only later, after
ieee80211_tear_down_links() (including its synchronize_rcu()) and
drv_change_vif_links(), calls ieee80211_sta_remove_link(), which takes
the link station out of the hash. RX runs under RCU only, so a data
frame from that link's address arriving in this window finds the link
station but a NULL link, and the kernel oopses in softirq context. A
link is removed this way for example when an associated AP announces
removal of one of its links (ieee80211_ml_reconf_work()), and the
frames only need a matching transmitter address, before any crypto.
Before the rework, ieee80211_rx_data_set_link() returned false for a
NULL link and the frame was skipped. Skip it again.
Fixes: 6d531b9af16e ("wifi: mac80211: rework RX packet handling")
Signed-off-by: Joas Antonio dos Santos <joasantonio108@gmail.com>
---
Found by LLM-assisted code review of the RX rework and confirmed by
reading the link removal path by hand. I have not reproduced the oops
at runtime.
v1 got no replies but is marked "Changes Requested" in patchwork, so I
am not sure what is expected. Please let me know if something else is
wanted here.
---
Changes in v2:
- Rebased on wireless/for-next (763b13f622e2), no code changes.
- Link to v1: https://lore.kernel.org/r/20261102-mac80211-rx-null-link-v1-1-3330b6b18c76@gmail.com
---
net/mac80211/rx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index f8cfd04c0c6c..a1db6488e4bc 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -5505,7 +5505,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
sdata = sta->sdata;
link = rcu_dereference(sdata->link[link_sta->link_id]);
- if (!ieee80211_rx_valid_freq(status->freq, link))
+ if (!link || !ieee80211_rx_valid_freq(status->freq, link))
continue;
if (rx_data_pending) {
---
base-commit: 763b13f622e2758726e8e3ecaef819db8fa0430a
change-id: 20261102-mac80211-rx-null-link-6f2e0b50f6bb
Best regards,
--
Joas Antonio dos Santos <joasantonio108@gmail.com>
next reply other threads:[~2026-11-16 19:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 19:37 Joas Antonio dos Santos via B4 Relay [this message]
2026-11-16 19:38 ` [PATCH wireless v2] wifi: mac80211: check for a NULL link in the MLD station RX loop Johannes Berg
2026-11-16 20:15 ` Joas Antonio
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=20261116-mac80211-rx-null-link-v2-1-ea512ae98139@gmail.com \
--to=devnull+joasantonio108.gmail.com@kernel.org \
--cc=benjamin.berg@intel.com \
--cc=joasantonio108@gmail.com \
--cc=johannes@sipsolutions.net \
--cc=linux-kernel@vger.kernel.org \
--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