diff options
| author | norly <ny-git@enpas.org> | 2013-05-30 18:13:59 +0100 |
|---|---|---|
| committer | norly <ny-git@enpas.org> | 2013-05-30 18:13:59 +0100 |
| commit | d5c411ba043ef62c81e4941990f0625bd3ea3814 (patch) | |
| tree | 3252f3cbb0f4853be65d27171b62d33368bd1772 /src/elfops/check.c | |
| parent | 4addee4bda6064926b24cd1ae929303003bd9ff1 (diff) | |
More rigorous sh_addr and sh_offset checking
Diffstat (limited to 'src/elfops/check.c')
| -rw-r--r-- | src/elfops/check.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/elfops/check.c b/src/elfops/check.c index daf6542..be8704b 100644 --- a/src/elfops/check.c +++ b/src/elfops/check.c @@ -165,7 +165,10 @@ int elfu_eCheck(Elf *e) * Find parent PHDR: */ for (j = 0; j < numPhdr; j++) { if (PHDR_CONTAINS_SCN_IN_MEMORY(&phdrs[j], &shdrs[i])) { - if (!PHDR_CONTAINS_SCN_IN_FILE(&phdrs[j], &shdrs[i])) { + GElf_Off shoff = phdrs[j].p_offset + (shdrs[i].sh_addr - phdrs[j].p_vaddr); + + if (shdrs[i].sh_offset != shoff + || !PHDR_CONTAINS_SCN_IN_FILE(&phdrs[j], &shdrs[i])) { ELFU_WARN("elfu_eCheck: Memory/file offsets/sizes are not congruent for SHDR %d, PHDR %d.\n", i, j); goto ERROR; } |