On Wed, Nov 16, 2016 at 10:52:41AM +0100, Uwe Kleine-König wrote:
> A binary header is 12 bytes + (4 bytes * Number of Arguments) bigger
> than the actual binary. Before this commit image extraction was wrong an
> made binary.0 too big by four bytes at the end (which were 0 in all usual
> cases). Image creation had the same problem which resulted in broken
> images when the binary doesn't end in 4 bytes containing 0.
>
> Further handle binaries with a length that is not aligned to 4 bytes.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Applied, thanks
Sascha
> ---
> Changes since (implicit) v1:
> - make it patch 1 as it is a fix
>
> scripts/kwbimage.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c
> index 448ac2a5d416..c560f581a727 100644
> --- a/scripts/kwbimage.c
> +++ b/scripts/kwbimage.c
> @@ -490,7 +490,7 @@ static int image_extract_binary_hdr_v1(const void *binary, const char *output,
> }
>
> ret = fwrite(binary + (nargs + 1) * sizeof(unsigned int),
> - binsz - (nargs + 1) * sizeof(unsigned int), 1,
> + binsz - (nargs + 2) * sizeof(unsigned int), 1,
> binaryout);
> if (ret != 1) {
> fprintf(stderr, "Could not write to output file %s\n",
> @@ -869,8 +869,8 @@ static void *image_create_v1(struct image_cfg_element *image_cfg,
> return NULL;
> }
>
> - headersz += s.st_size +
> - binarye->binary.nargs * sizeof(unsigned int);
> + headersz += ALIGN_SUP(s.st_size, 4) +
> + 12 + binarye->binary.nargs * sizeof(unsigned int);
> hasext = 1;
> }
>
> @@ -951,8 +951,8 @@ static void *image_create_v1(struct image_cfg_element *image_cfg,
> fstat(fileno(bin), &s);
>
> binhdrsz = sizeof(struct opt_hdr_v1) +
> - (binarye->binary.nargs + 1) * sizeof(unsigned int) +
> - s.st_size;
> + (binarye->binary.nargs + 2) * sizeof(unsigned int) +
> + ALIGN_SUP(s.st_size, 4);
> hdr->headersz_lsb = binhdrsz & 0xFFFF;
> hdr->headersz_msb = (binhdrsz & 0xFFFF0000) >> 16;
>
> @@ -976,7 +976,7 @@ static void *image_create_v1(struct image_cfg_element *image_cfg,
>
> fclose(bin);
>
> - cur += s.st_size;
> + cur += ALIGN_SUP(s.st_size, 4);
>
> /*
> * For now, we don't support more than one binary
> --
> 2.10.2
>
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
