mirrors/sunxi-tools
0
0
Fork 0
mirror of https://github.com/linux-sunxi/sunxi-tools.git synced 2024-11-26 19:33:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fexc: Convert version[0] header field to filesize

Browse Source 
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 <bernhard.nortmann@web.de>
This commit is contained in:
Bernhard Nortmann 2016-11-10 13:12:34 +01:00
parent bf735b2c47
commit 2a4af4f5f2
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
script_bin.c
View File

@ -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++) {

3
script_bin.h
View File

@ -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[];
};