From: "Tianchu Chen" <tianchu.chen@linux.dev>
To: linux-wireless@vger.kernel.org
Cc: libertas-dev@lists.infradead.org
Subject: [PATCH] wifi: libertas: fix RX OOB access from device-controlled pkt_ptr
Date: Thu, 24 Sep 2026 10:19:43 +0000 [thread overview]
Message-ID: <f22d4f23e5e54b1debd6038b3b75119f97920a73@linux.dev> (raw)
From: Tianchu Chen <flynnnchen@tencent.com>
lbs_process_rxed_packet() computes the packet header pointer as
skb->data + rxpd->pkt_ptr, where pkt_ptr is a 32-bit value supplied
by the device, and never checks it against the packet length. The
only validation (skb->len < ETH_HLEN + 8 + sizeof(struct rxpd))
bounds the total length, not pkt_ptr.
A bogus device can report an arbitrary pkt_ptr:
- the memcmp() against the RFC1042 header reads 6 bytes at
pkt_ptr + 14, potentially past the skb buffer
- if the compared bytes happen to match, the EthernetII header
reconstruction writes 12 bytes at pkt_ptr + 8;
- hdrchop derived from pkt_ptr is later passed to skb_pull().
Validate pkt_ptr before using it: it must leave room for a full
struct rxpackethdr within the received frame. It is not expected
to affect the driver behavior in most cases, only invalid pkt_ptr
packets being dropped.
Discovered by Atuin - Automated Vulnerability Discovery Engine.
Fixes: e45d8e534b67 ("libertas: add support for Marvell SD8688 chip")
Cc: stable@vger.kernel.org
Assisted-by: LLM
Signed-off-by: Tianchu Chen <flynnnchen@tencent.com>
---
drivers/net/wireless/marvell/libertas/rx.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/wireless/marvell/libertas/rx.c b/drivers/net/wireless/marvell/libertas/rx.c
index c34d30f7cbe03..a9d1320d90b15 100644
--- a/drivers/net/wireless/marvell/libertas/rx.c
+++ b/drivers/net/wireless/marvell/libertas/rx.c
@@ -89,6 +89,15 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
goto done;
}
+ if (le32_to_cpu(p_rx_pd->pkt_ptr) >
+ skb->len - sizeof(struct rxpackethdr)) {
+ lbs_deb_rx("rx err: pkt_ptr beyond packet\n");
+ dev->stats.rx_length_errors++;
+ ret = -EINVAL;
+ dev_kfree_skb(skb);
+ goto done;
+ }
+
lbs_deb_rx("rx data: skb->len - pkt_ptr = %d-%zd = %zd\n",
skb->len, (size_t)le32_to_cpu(p_rx_pd->pkt_ptr),
skb->len - (size_t)le32_to_cpu(p_rx_pd->pkt_ptr));
--
2.51.0
reply other threads:[~2026-09-24 10:19 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=f22d4f23e5e54b1debd6038b3b75119f97920a73@linux.dev \
--to=tianchu.chen@linux.dev \
--cc=libertas-dev@lists.infradead.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