From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@barebox.org>
Subject: [PATCH] ubootvar: reject copies too small for their header
Date: Thu, 15 Oct 2026 16:10:49 +0200 [thread overview]
Message-ID: <20261015141050.1329095-1-a.fatoum@pengutronix.de> (raw)
From: Ahmad Fatoum <a.fatoum@barebox.org>
Probe subtracts the size of the CRC and flag header from the size of
each copy unchecked. For a partition smaller than that, the size wraps
around and the CRC is computed over most of the address space.
Let's fail probe with -EINVAL for such a copy instead.
Fixes: 9fdbd39f320a ("misc: Add a driver to expose U-Boot environment variable data")
Assisted-by: Claude:opus-5.5
Signed-off-by: Ahmad Fatoum <a.fatoum@barebox.org>
---
drivers/misc/ubootvar.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/misc/ubootvar.c b/drivers/misc/ubootvar.c
index 8c387843bab1..9e2600b5c527 100644
--- a/drivers/misc/ubootvar.c
+++ b/drivers/misc/ubootvar.c
@@ -232,6 +232,13 @@ static int ubootenv_probe(struct device *dev)
goto out;
}
+ if (size[i] < sizeof(uint32_t) + (count > 1)) {
+ dev_err(dev, "U-Boot environment %s is too small\n",
+ ubdata->path[i]);
+ ret = -EINVAL;
+ goto out;
+ }
+
crc[i] = *(uint32_t *)data[i];
size[i] -= sizeof(uint32_t);
--
2.47.3
reply other threads:[~2026-10-15 14:12 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=20261015141050.1329095-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=a.fatoum@barebox.org \
--cc=barebox@lists.infradead.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