sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Sebastian Hesselbarth 2013-11-12 21:58:04 +01:00 committed by Sascha Hauer
parent 4f3570c470
commit 6b5874f706
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/kwbimage.c
View File

@ -685,6 +685,7 @@ static int image_create_payload(void *payload_start, size_t payloadsz,
const char *payload_filename) const char *payload_filename)
{ {
FILE *payload; FILE *payload;
struct stat s;
uint32_t *payload_checksum = uint32_t *payload_checksum =
(uint32_t *) (payload_start + payloadsz); (uint32_t *) (payload_start + payloadsz);
int ret; int ret;
@ -696,7 +697,14 @@ static int image_create_payload(void *payload_start, size_t payloadsz,
return -1; 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) { if (ret != 1) {
fprintf(stderr, "Cannot read payload file %s\n", fprintf(stderr, "Cannot read payload file %s\n",
payload_filename); payload_filename);
@ -747,7 +755,8 @@ static void *image_create_v0(struct image_cfg_element *image_cfg,
return NULL; 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 */ /* Headers, payload and 32-bits checksum */
@ -875,7 +884,8 @@ static void *image_create_v1(struct image_cfg_element *image_cfg,
return NULL; 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 /* The payload should be aligned on some reasonable