From: Stefan Roese <sr@denx.de>
To: "Pali Rohár" <pali@kernel.org>
Cc: u-boot@lists.denx.de, "Marek Behún" <marek.behun@nic.cz>
Subject: Re: [PATCH 1/4] tools: kwbimage: Verify supported image version
Date: Wed, 1 Sep 2021 11:07:57 +0200 [thread overview]
Message-ID: <1c96b6a1-2cf0-7137-a52b-595fb4f7622e@denx.de> (raw)
In-Reply-To: <20210811081417.18010-1-pali@kernel.org>
On 11.08.21 10:14, Pali Rohár wrote:
> Only image versions 0 and 1 are supported. Verify it in
> kwbimage_verify_header() function.
>
> Signed-off-by: Pali Rohár <pali@kernel.org>
Applied to u-boot-marvell/master
Thanks,
Stefan
> ---
> tools/kwbimage.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tools/kwbimage.c b/tools/kwbimage.c
> index 4bff02bb3fb5..80aae8a6b619 100644
> --- a/tools/kwbimage.c
> +++ b/tools/kwbimage.c
> @@ -1690,9 +1690,7 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
> if (checksum != ext_hdr->checksum)
> return -FDT_ERR_BADSTRUCTURE;
> }
> - }
> -
> - if (image_version((void *)ptr) == 1) {
> + } else if (image_version((void *)ptr) == 1) {
> struct main_hdr_v1 *mhdr = (struct main_hdr_v1 *)ptr;
> uint32_t offset;
> uint32_t size;
> @@ -1762,6 +1760,8 @@ static int kwbimage_verify_header(unsigned char *ptr, int image_size,
> if (image_checksum32(ptr + offset, size - 4) !=
> *(uint32_t *)(ptr + offset + size - 4))
> return -FDT_ERR_BADSTRUCTURE;
> + } else {
> + return -FDT_ERR_BADSTRUCTURE;
> }
>
> return 0;
>
Viele Grüße,
Stefan
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de
prev parent reply other threads:[~2021-09-01 9:08 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 ` [PATCH 2/4] tools: kwbimage: Verify size of v0 image header Pali Rohár
2021-08-11 14:18 ` 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 [this message]
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=1c96b6a1-2cf0-7137-a52b-595fb4f7622e@denx.de \
--to=sr@denx.de \
--cc=marek.behun@nic.cz \
--cc=pali@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.