mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Cc: ukl@pengutronix.de
Subject: Re: [PATCH] filetype: mvebu: Fix kwbimage v1 detection
Date: Fri, 15 Nov 2019 11:58:38 +0100	[thread overview]
Message-ID: <20191115105838.ddhd2xzst5vohcv7@pengutronix.de> (raw)
In-Reply-To: <20191115103800.15564-1-s.hauer@pengutronix.de>

On Fri, Nov 15, 2019 at 11:38:00AM +0100, Sascha Hauer wrote:
> The kwbimage detection calculates a checksum over the first 31 bytes of
> the image. This is correct for the v0 image format, but for the v1 image
> format the checksum in the image also covers the extenstion headers.
> These might not be completely present in the initial buffer provided to
> file_detect_type(), so just drop the checksum calculation for v1 images.
> 
> Fixes: bf8b6d46db ("kwbimage_v0: add support to detect and boot a mvebu v0 image")
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  common/filetype.c | 22 ++++++++++++----------
>  1 file changed, 12 insertions(+), 10 deletions(-)
> 
> diff --git a/common/filetype.c b/common/filetype.c
> index 4966c5e068..ad7f301d71 100644
> --- a/common/filetype.c
> +++ b/common/filetype.c
> @@ -316,19 +316,21 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
>  	     buf8[0] == 0x8b || buf8[0] == 0x9c) &&
>  	    buf8[0x1] == 0 && buf8[0x2] == 0 && buf8[0x3] == 0 &&
>  	    buf8[0x18] == 0 && buf8[0x1b] == 0 && buf8[0x1c] == 0) {
> -		unsigned char sum = 0;
> -		int i;
>  
> -		for (i = 0; i <= 0x1e; ++i)
> -			sum += buf8[i];
> +		if (buf8[0x8] == 0) {
> +			unsigned char sum = 0;
> +			int i;
>  
> -		if (sum == buf8[0x1f] && buf8[0x8] == 0)
> -			return filetype_kwbimage_v0;
> +			for (i = 0; i <= 0x1e; ++i)
> +				sum += buf8[i];
>  
> -		if (sum == buf8[0x1f] &&
> -		    buf8[0x8] == 1 && buf8[0x1d] == 0 &&
> -		    (buf8[0x1e] == 0 || buf8[0x1e] == 1))
> -			return filetype_kwbimage_v1;
> +			if (sum == buf8[0x1f])
> +				return filetype_kwbimage_v0;
> +		} else if (buf8[0x8] == 1) {
> +			if (sum == buf8[0x1f] && buf8[0x1d] == 0 &&

sum == buf8[0x1f] must be dropped here.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2019-11-15 10:58 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-15 10:38 Sascha Hauer
2019-11-15 10:58 ` Sascha Hauer [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=20191115105838.ddhd2xzst5vohcv7@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=ukl@pengutronix.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