summaryrefslogtreecommitdiffstats
path: root/scripts/kwbimage.c
diff options
context:
space:
mode:
authorSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>2013-11-12 21:58:04 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-11-18 10:53:17 +0100
commit6b5874f706ee7768e66f509789d4b047785f3af4 (patch)
treead49cf586eae77f359ab304e513543ca5b846593 /scripts/kwbimage.c
parent4f3570c470e7df13c7bd9d4bd7a720922d97e9c5 (diff)
downloadbarebox-6b5874f706ee7768e66f509789d4b047785f3af4.tar.gz
barebox-6b5874f706ee7768e66f509789d4b047785f3af4.tar.xz
scripts: kwbimage: fix mis-sized payload
Image payload size should always be a multiple of 4 bytes. This fixes mis-sized image payload by allocating payload buffer as multiple of 4 but load true filesize into the payload buffer. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'scripts/kwbimage.c')
-rw-r--r--scripts/kwbimage.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c
index 4ebb07fe22..82cf21c4c8 100644
--- a/scripts/kwbimage.c
+++ b/scripts/kwbimage.c
@@ -685,6 +685,7 @@ static int image_create_payload(void *payload_start, size_t payloadsz,
const char *payload_filename)
{
FILE *payload;
+ struct stat s;
uint32_t *payload_checksum =
(uint32_t *) (payload_start + payloadsz);
int ret;
@@ -696,7 +697,14 @@ static int image_create_payload(void *payload_start, size_t payloadsz,
return -1;
}
- ret = fread(payload_start, payloadsz, 1, payload);
+ ret = stat(payload_filename, &s);
+ if (ret < 0) {
+ fprintf(stderr, "Cannot stat payload file %s\n",
+ payload_filename);
+ return ret;
+ }
+
+ ret = fread(payload_start, s.st_size, 1, payload);
if (ret != 1) {
fprintf(stderr, "Cannot read payload file %s\n",
payload_filename);
@@ -747,7 +755,8 @@ static void *image_create_v0(struct image_cfg_element *image_cfg,
return NULL;
}
- payloadsz = s.st_size;
+ /* payload size must be multiple of 32b */
+ payloadsz = 4 * ((s.st_size + 3)/4);
}
/* Headers, payload and 32-bits checksum */
@@ -875,7 +884,8 @@ static void *image_create_v1(struct image_cfg_element *image_cfg,
return NULL;
}
- payloadsz = s.st_size;
+ /* payload size must be multiple of 32b */
+ payloadsz = 4 * ((s.st_size + 3)/4);
}
/* The payload should be aligned on some reasonable