From 76b391cdee022b2fe2ad5627ec8ee7ebab046c1c Mon Sep 17 00:00:00 2001 From: Reinhard Pfau Date: Sun, 29 Nov 2015 15:52:14 +0100 Subject: [PATCH] tools/kwbimage: fix size computations for v1 images Fix computation of haeder size and binary header size. Size of opt header and some 32bit values were not taken into account. This could result in invalid boot images (due to the wrong binary header size, the image could claim to have another extension header after the binary extension although there is none). Use "uint32_t" instead of "unsigned int" for header size computation. Signed-off-by: Reinhard Pfau Reviewed-by: Stefan Roese Cc: Luka Perkov --- tools/kwbimage.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/kwbimage.c b/tools/kwbimage.c index a0ea7d190c..369aba7bca 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -324,8 +324,9 @@ static size_t image_headersz_v1(struct image_tool_params *params, return 0; } - headersz += s.st_size + - binarye->binary.nargs * sizeof(unsigned int); + headersz += sizeof(struct opt_hdr_v1) + + s.st_size + + (binarye->binary.nargs + 2) * sizeof(uint32_t); if (hasext) *hasext = 1; } @@ -419,7 +420,7 @@ static void *image_create_v1(size_t *imagesz, struct image_tool_params *params, fstat(fileno(bin), &s); binhdrsz = sizeof(struct opt_hdr_v1) + - (binarye->binary.nargs + 1) * sizeof(unsigned int) + + (binarye->binary.nargs + 2) * sizeof(uint32_t) + s.st_size; /* -- 2.39.5