From: Tristan Madani <tristmd@gmail.com>
To: Brian Norris <briannorris@chromium.org>,
Francesco Dolcini <francesco@dolcini.it>
Cc: linux-wireless@vger.kernel.org, stable@vger.kernel.org,
Tristan Madani <tristan@talencesecurity.com>
Subject: [PATCH wireless 2/2] wifi: mwifiex: validate sta_count in AP sta_list response
Date: Sun, 1 Nov 2026 21:51:12 +0000 [thread overview]
Message-ID: <20261101215112.3199197-3-tristmd@gmail.com> (raw)
In-Reply-To: <20261101215112.3199197-1-tristmd@gmail.com>
From: Tristan Madani <tristan@talencesecurity.com>
mwifiex_ret_uap_sta_list() iterates over sta_info entries using the
firmware-provided sta_count without verifying the response buffer is
large enough to hold that many entries.
Add a size check that validates the response contains enough data for
the declared number of station entries before iterating.
Fixes: 8baca1a34d4c ("mwifiex: dump station support in uap mode")
Cc: stable@vger.kernel.org
Signed-off-by: Tristan Madani <tristan@talencesecurity.com>
---
drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
index 85512f526c5f2a..4d8493f9a6697e 100644
--- a/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c
@@ -973,11 +973,19 @@ static int mwifiex_ret_uap_sta_list(struct mwifiex_private *priv,
{
struct host_cmd_ds_sta_list *sta_list =
&resp->params.sta_list;
- struct mwifiex_ie_types_sta_info *sta_info = (void *)&sta_list->tlv;
- int i;
+ struct mwifiex_ie_types_sta_info *sta_info;
+ u16 sta_count = le16_to_cpu(sta_list->sta_count);
+ u16 resp_size = le16_to_cpu(resp->size);
struct mwifiex_sta_node *sta_node;
+ int i;
+
+ if (resp_size < sizeof(*resp) - sizeof(resp->params) +
+ sizeof(*sta_list) + sta_count * sizeof(*sta_info))
+ return -EINVAL;
+
+ sta_info = (void *)&sta_list->tlv;
- for (i = 0; i < (le16_to_cpu(sta_list->sta_count)); i++) {
+ for (i = 0; i < sta_count; i++) {
sta_node = mwifiex_get_sta_entry(priv, sta_info->mac);
if (unlikely(!sta_node))
continue;
--
2.47.3
prev parent reply other threads:[~2026-11-01 21:51 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-01 21:51 [PATCH wireless 0/2] wifi: mwifiex: firmware response validation fixes (WMM + sta_list) Tristan Madani
2026-11-01 21:51 ` [PATCH wireless 1/2] wifi: mwifiex: validate WMM queue_index in firmware response Tristan Madani
2026-11-01 21:51 ` Tristan Madani [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=20261101215112.3199197-3-tristmd@gmail.com \
--to=tristmd@gmail.com \
--cc=briannorris@chromium.org \
--cc=francesco@dolcini.it \
--cc=linux-wireless@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tristan@talencesecurity.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