From: "Pali Rohár" <pali@kernel.org>
To: Stefan Roese <sr@denx.de>
Cc: u-boot@lists.denx.de, "Marek Behún" <marek.behun@nic.cz>
Subject: [PATCH 2/4] tools: kwbimage: Verify size of v0 image header
Date: Wed, 11 Aug 2021 10:14:15 +0200 [thread overview]
Message-ID: <20210811081417.18010-2-pali@kernel.org> (raw)
In-Reply-To: <20210811081417.18010-1-pali@kernel.org>
Check that extended image header size is not larger than file size.
Signed-off-by: Pali Rohár <pali@kernel.org>
---
tools/kwbimage.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/kwbimage.c b/tools/kwbimage.c
index 80aae8a6b619..84c41210e39e 100644
--- a/tools/kwbimage.c
+++ b/tools/kwbimage.c
@@ -1682,6 +1682,9 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
if (mhdr->ext & 0x1) {
struct ext_hdr_v0 *ext_hdr;
+ if (header_size + sizeof(*ext_hdr) > image_size)
+ return -FDT_ERR_BADSTRUCTURE;
+
ext_hdr = (struct ext_hdr_v0 *)
(ptr + sizeof(struct main_hdr_v0));
checksum = image_checksum8(ext_hdr,
--
2.20.1
next prev parent reply other threads:[~2021-08-11 8:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 8:14 [PATCH 1/4] tools: kwbimage: Verify supported image version Pali Rohár
2021-08-11 8:14 ` Pali Rohár [this message]
2021-08-11 14:18 ` [PATCH 2/4] tools: kwbimage: Verify size of v0 image header Stefan Roese
2021-09-01 9:08 ` Stefan Roese
2021-08-11 8:14 ` [PATCH 3/4] tools: kwbimage: Verify size of image data Pali Rohár
2021-08-11 14:19 ` Stefan Roese
2021-09-01 9:08 ` Stefan Roese
2021-08-11 8:14 ` [PATCH 4/4] tools: kwbimage: Use IBR_HDR_* constants instead of raw numbers Pali Rohár
2021-08-11 14:19 ` Stefan Roese
2021-09-01 9:08 ` Stefan Roese
2021-08-11 14:18 ` [PATCH 1/4] tools: kwbimage: Verify supported image version Stefan Roese
2021-09-01 9:07 ` Stefan Roese
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=20210811081417.18010-2-pali@kernel.org \
--to=pali@kernel.org \
--cc=marek.behun@nic.cz \
--cc=sr@denx.de \
--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