From: "Pali Rohár" <pali@kernel.org>
To: Simon Glass <sjg@chromium.org>, Tero Kristo <t-kristo@ti.com>
Cc: u-boot@lists.denx.de
Subject: [PATCH] bootm: Fix upper bound of FDT overlap checks
Date: Sat, 27 Aug 2022 14:48:10 +0200 [thread overview]
Message-ID: <20220827124810.11616-1-pali@kernel.org> (raw)
FTD blob can be put immediately after the OS image.
So use strict inequality for start address check.
Fixes: fbde7589ce30 ("common: bootm: add checks to verify if ramdisk / fdtimage overlaps OS image")
Signed-off-by: Pali Rohár <pali@kernel.org>
---
boot/bootm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/boot/bootm.c b/boot/bootm.c
index 86dbfbcfed5b..e4493f3ed5f1 100644
--- a/boot/bootm.c
+++ b/boot/bootm.c
@@ -305,9 +305,9 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start,
/* check if FDT overlaps OS image */
if (images.ft_addr &&
(((ulong)images.ft_addr >= start &&
- (ulong)images.ft_addr <= start + size) ||
+ (ulong)images.ft_addr < start + size) ||
((ulong)images.ft_addr + images.ft_len >= start &&
- (ulong)images.ft_addr + images.ft_len <= start + size))) {
+ (ulong)images.ft_addr + images.ft_len < start + size))) {
printf("ERROR: FDT image overlaps OS image (OS=0x%lx..0x%lx)\n",
start, start + size);
return 1;
--
2.20.1
next reply other threads:[~2022-08-27 12:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-27 12:48 Pali Rohár [this message]
2022-08-30 2:30 ` [PATCH] bootm: Fix upper bound of FDT overlap checks Simon Glass
2022-08-31 23:34 ` Tom Rini
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=20220827124810.11616-1-pali@kernel.org \
--to=pali@kernel.org \
--cc=sjg@chromium.org \
--cc=t-kristo@ti.com \
--cc=u-boot@lists.denx.de \
/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