From: Zhao Li <enderaoelyther@gmail.com>
To: linux-wireless@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Miri Korenblit <miriam.rachel.korenblit@intel.com>,
Brian Norris <briannorris@chromium.org>,
Francesco Dolcini <francesco@dolcini.it>,
Johannes Berg <johannes@sipsolutions.net>,
Jaewan Kim <jaewan@google.com>,
Daniel Gabay <daniel.gabay@intel.com>,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Benjamin Berg <benjamin.berg@intel.com>,
Anjaneyulu <pagadala.yesu.anjaneyulu@intel.com>,
Peddolla Harshavardhan Reddy <peddolla.reddy@oss.qualcomm.com>,
Lorenzo Bianconi <lorenzo@kernel.org>,
John Crispin <john@phrozen.org>,
Avinash Patil <patila@marvell.com>, Cathy Luo <cluo@marvell.com>,
"John W. Linville" <linville@tuxdriver.com>,
Aloka Dixit <quic_alokad@quicinc.com>,
Zhao Li <enderaoelyther@gmail.com>
Subject: [PATCH 5/8] wifi: mac80211: validate probe response countdown offsets
Date: Thu, 9 Jul 2026 03:59:08 +0800 [thread overview]
Message-ID: <20260708195911.84365-6-enderaoelyther@gmail.com> (raw)
In-Reply-To: <20260708195911.84365-1-enderaoelyther@gmail.com>
ieee80211_set_beacon_cntdwn() writes the current countdown value into
each configured counter offset. For the beacon it skips offset 0 as an
unused entry and bounds each non-zero offset against the template length
before writing. The AP probe-response branch reuses the same
counter-offset array but indexes resp->data[] with neither the
zero-sentinel skip nor the length check.
A probe-response template whose countdown offset is 0 or points past
resp->len therefore takes a stray or out-of-bounds write. Apply the same
zero-sentinel and length checks the beacon path uses before writing the
probe-response countdown byte.
Fixes: 5f9404abdf2a ("mac80211: add support for BSS color change")
Assisted-by: Codex:gpt-5
Assisted-by: Claude:opus-4.8
Signed-off-by: Zhao Li <enderaoelyther@gmail.com>
---
net/mac80211/tx.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 91b14112e24f0..84b6eda46a8f0 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -5249,6 +5249,10 @@ static void ieee80211_set_beacon_cntdwn(struct ieee80211_sub_if_data *sdata,
if (sdata->vif.type == NL80211_IFTYPE_AP && resp) {
u16 *resp_offsets = resp->cntdwn_counter_offsets;
+ if (!resp_offsets[i])
+ continue;
+ if (WARN_ON_ONCE(resp_offsets[i] >= resp->len))
+ return;
resp->data[resp_offsets[i]] = count;
}
}
--
2.50.1 (Apple Git-155)
next prev parent reply other threads:[~2026-07-08 20:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-08 19:59 [PATCH 0/8] wifi: fix PMSR lifetime and frame validation issues Zhao Li
2026-07-08 19:59 ` [PATCH 1/8] wifi: mac80211_hwsim: clear PMSR request state on abort Zhao Li
2026-07-08 19:59 ` [PATCH 2/8] wifi: mac80211_hwsim: authenticate PMSR report senders Zhao Li
2026-07-08 19:59 ` [PATCH 3/8] wifi: iwlwifi: mld: abort active PMSR requests Zhao Li
2026-07-08 19:59 ` [PATCH 4/8] wifi: cfg80211: guard optional PMSR nominal time Zhao Li
2026-07-08 19:59 ` Zhao Li [this message]
2026-07-08 19:59 ` [PATCH 6/8] wifi: mac80211: validate S1G TWT params before driver setup Zhao Li
2026-07-08 19:59 ` [PATCH 7/8] wifi: mwifiex: validate action frame fixed fields Zhao Li
2026-07-08 19:59 ` [PATCH 8/8] wifi: nl80211: clean up color-change beacon data on errors Zhao Li
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=20260708195911.84365-6-enderaoelyther@gmail.com \
--to=enderaoelyther@gmail.com \
--cc=benjamin.berg@intel.com \
--cc=briannorris@chromium.org \
--cc=cluo@marvell.com \
--cc=daniel.gabay@intel.com \
--cc=emmanuel.grumbach@intel.com \
--cc=francesco@dolcini.it \
--cc=jaewan@google.com \
--cc=johannes@sipsolutions.net \
--cc=john@phrozen.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=lorenzo@kernel.org \
--cc=miriam.rachel.korenblit@intel.com \
--cc=pagadala.yesu.anjaneyulu@intel.com \
--cc=patila@marvell.com \
--cc=peddolla.reddy@oss.qualcomm.com \
--cc=quic_alokad@quicinc.com \
/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