leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/kwbimage: fix size computations for v1 images

Browse Source 
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 <reinhard.pfau@gdsys.cc>
Reviewed-by: Stefan Roese <sr@denx.de>
Cc: Luka Perkov <luka.perkov@sartura.hr>
This commit is contained in:
Reinhard Pfau 2015-11-29 15:52:14 +01:00 committed by Luka Perkov
parent a8840dced0
commit 76b391cdee
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/kwbimage.c
View File

@ -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;
/*