OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rimage: fix elf section collision detection. 

Section end was not checked. Now fixed. Added more error output to
identify.

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
This commit is contained in:
Liam Girdwood 2018-02-22 15:40:25 +00:00
parent 8a76994b10
commit 9d5c466380
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rimage/elf.c
View File

@ -303,7 +303,7 @@ static void elf_module_limits(struct image *image, struct module *module)
/* make sure no section overlap from any modules */
int elf_validate_section(struct image *image, struct module *module,
Elf32_Shdr *section)
Elf32_Shdr *section, int index)
{
struct module *m;
Elf32_Shdr *s;
@ -322,14 +322,21 @@ int elf_validate_section(struct image *image, struct module *module,
continue;
/* only check valid sections */
if (!(section->sh_flags & valid))
if (!(s->sh_flags & valid))
continue;
if (section->sh_size == 0)
if (s->sh_size == 0)
continue;
/* is section non overlapping ? */
/* is section start non overlapping ? */
if (section->sh_addr >= s->sh_addr &&
section->sh_addr <
s->sh_addr + s->sh_size) {
goto err;
}
/* is section end non overlapping ? */
if (section->sh_addr + section->sh_size > s->sh_addr &&
section->sh_addr + section->sh_size <=
s->sh_addr + s->sh_size) {
goto err;
@ -340,8 +347,8 @@ int elf_validate_section(struct image *image, struct module *module,
return 0;
err:
fprintf(stderr, "error: section overlap between %s and %s\n",
module->elf_file, m->elf_file);
fprintf(stderr, "error: section overlap between %s:%d and %s:%d\n",
module->elf_file, index, m->elf_file, j);
fprintf(stderr, " [0x%x : 0x%x] overlaps with [0x%x :0x%x]\n",
section->sh_addr, section->sh_addr + section->sh_size,
s->sh_addr, s->sh_addr + s->sh_size);
@ -372,7 +379,7 @@ int elf_validate_modules(struct image *image)
continue;
/* is section non overlapping ? */
ret = elf_validate_section(image, module, section);
ret = elf_validate_section(image, module, section, j);
if (ret < 0)
return ret;
}

2
rimage/rimage.h
View File

@ -156,7 +156,7 @@ int elf_validate_modules(struct image *image);
int elf_find_section(struct image *image, struct module *module,
const char *name);
int elf_validate_section(struct image *image, struct module *module,
Elf32_Shdr *section);
Elf32_Shdr *section, int index);
/* supported machines */
extern const struct adsp machine_byt;