From 2a4af4f5f2e282849d49b4508456a4ede89b90b4 Mon Sep 17 00:00:00 2001 From: Bernhard Nortmann Date: Thu, 10 Nov 2016 13:12:34 +0100 Subject: [PATCH] fexc: Convert version[0] header field to filesize Vendor-provided .bin files have repeatedly demonstrated that our previous interpretation of this field as version[0] is likely wrong. Instead, it seems to represent the file size (in bytes) of the .bin file. This commit fixes both decompilation (and header checks) and generation of .bin files, where it will now store the size to this field. TODO: It's unclear whether the 'filesize' needs some specific alignment (and the .bin corresponding padding). A value of 34864 (0x8830) has already been observed, so any possible alignment is expected not to exceed 16 bytes (0x10). (Currently our .bin generator doesn't care about any specific alignment.) Signed-off-by: Bernhard Nortmann --- script_bin.c | 25 ++++++++++++------------- script_bin.h | 3 ++- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/script_bin.c b/script_bin.c index 3315f67..29c2735 100644 --- a/script_bin.c +++ b/script_bin.c @@ -97,7 +97,7 @@ size_t script_bin_size(struct script *script, return bin_size; } -int script_generate_bin(void *bin, size_t UNUSED(bin_size), +int script_generate_bin(void *bin, size_t bin_size, struct script *script, size_t sections, size_t entries) { @@ -122,9 +122,9 @@ int script_generate_bin(void *bin, size_t UNUSED(bin_size), (void*)data-bin); head->sections = sections; - head->version[0] = 0; - head->version[1] = 1; - head->version[2] = 2; + head->filesize = bin_size; + head->version[0] = 1; + head->version[1] = 2; for (ls = list_first(&script->sections); ls; ls = list_next(&script->sections, ls)) { @@ -326,11 +326,10 @@ int script_decompile_bin(void *bin, size_t bin_size, unsigned int i; struct script_bin_head *head = bin; - if (((head->version[0] & 0x3FFF) > SCRIPT_BIN_VERSION_LIMIT) || - (head->version[1] > SCRIPT_BIN_VERSION_LIMIT) || - (head->version[2] > SCRIPT_BIN_VERSION_LIMIT)) { - pr_err("Malformed data: version %u.%u.%u.\n", - head->version[0], head->version[1], head->version[2]); + if ((head->version[0] > SCRIPT_BIN_VERSION_LIMIT) || + (head->version[1] > SCRIPT_BIN_VERSION_LIMIT)) { + pr_err("Malformed data: version %u.%u.\n", + head->version[0], head->version[1]); return 0; } @@ -340,10 +339,10 @@ int script_decompile_bin(void *bin, size_t bin_size, return 0; } - pr_info("%s: version: %u.%u.%u\n", filename, - head->version[0] & 0x3FFF, head->version[1], head->version[2]); - pr_info("%s: size: %zu (%u sections)\n", filename, - bin_size, head->sections); + pr_info("%s: version: %u.%u\n", filename, + head->version[0], head->version[1]); + pr_info("%s: size: %zu (%u sections), header value: %u\n", filename, + bin_size, head->sections, head->filesize); /* TODO: SANITY: compare head.sections with bin_size */ for (i=0; i < head->sections; i++) { diff --git a/script_bin.h b/script_bin.h index 8f3c1a3..7448275 100644 --- a/script_bin.h +++ b/script_bin.h @@ -27,7 +27,8 @@ struct script_bin_section { /** binary representation of the head of the script file */ struct script_bin_head { uint32_t sections; - uint32_t version[3]; + uint32_t filesize; + uint32_t version[2]; struct script_bin_section section[]; };