summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2016-11-16 10:52:41 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-01-10 08:27:53 +0100
commitdcc7d82141a710ccc3d04a23351e59e341794131 (patch)
treef993525e22b89ce8f00903c8e79eb1e6fb551bcb
parentbb9125c93ef38757a436fe0f941c8c63fbc0477e (diff)
downloadbarebox-dcc7d82141a710ccc3d04a23351e59e341794131.tar.gz
scripts/kwbimage: fix handling of binary header
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@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--scripts/kwbimage.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c
index 448ac2a..c560f58 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