From: Abdelrahman Youssef <abdelrahmanyossef12@gmail.com>
To: barebox@lists.infradead.org
Cc: Abdelrahman Youssef <abdelrahmanyossef12@gmail.com>,
Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2] of: fdt: fix overflow caused by fdt_prop extending beyond fdt
Date: Tue, 19 Nov 2024 23:26:04 +0200 [thread overview]
Message-ID: <20241119212606.1668337-1-abdelrahmanyossef12@gmail.com> (raw)
While parsing FDT, fdt_prop sometimes extends beyond FDT resulting in
heap-overflow.
dt_ptr_ok() checks a pointer is within bounds of the FDT, so we can use it
here to fix the issue.
Suggested-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Abdelrahman Youssef <abdelrahmanyossef12@gmail.com>
---
drivers/of/fdt.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 75af1844f3..69c041cb89 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -257,6 +257,11 @@ static struct device_node *__of_unflatten_dtb(const void *infdt, int size,
case FDT_PROP:
fdt_prop = infdt + dt_struct;
+ if (!dt_ptr_ok(fdt, fdt_prop)) {
+ ret = -ESPIPE;
+ goto err;
+ }
+
len = fdt32_to_cpu(fdt_prop->len);
nodep = fdt_prop->data;
--
2.43.0
reply other threads:[~2024-11-19 21:26 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=20241119212606.1668337-1-abdelrahmanyossef12@gmail.com \
--to=abdelrahmanyossef12@gmail.com \
--cc=a.fatoum@pengutronix.de \
--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