diff options
| author | Mark Wielaard <[email protected]> | 2018-08-01 16:51:03 +0200 |
|---|---|---|
| committer | Mark Wielaard <[email protected]> | 2018-09-13 14:30:30 +0200 |
| commit | 68e8b84743bdb389776e3aa2bae27aba7f435fdb (patch) | |
| tree | 57b5c8ff6a38c61e0c7d63dc4b0bc234ef011ebb /src | |
| parent | 19756e7fb614831f4a5f5ff5b996675fae638782 (diff) | |
libebl: Use elf_getshdrstrndx in ebl_section_strip_p.
The ebl_section_strip_p function used the Ehdr e_shstrndx field
to get at the name of the (debug) sections. This is not correct
if there are more than SHN_LORESERVE sections. Use elf_getshdrstrndx
to get at the shstrtab section. And drop the Ehdr argument that isn't
necessary anymore.
Signed-off-by: Mark Wielaard <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/elfcmp.c | 4 | ||||
| -rw-r--r-- | src/strip.c | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a118519f..7d046ec3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2018-09-12 Mark Wielaard <[email protected]> + * elfcmp.c (main): Call ebl_section_strip_p without ehdr. + * strip.c (handle_elf): Likewise. + +2018-09-12 Mark Wielaard <[email protected]> + * elflint.c (check_symtab): Call ebl_check_special_symbol without ehdr. diff --git a/src/elfcmp.c b/src/elfcmp.c index b40df8bf..b68df688 100644 --- a/src/elfcmp.c +++ b/src/elfcmp.c @@ -254,7 +254,7 @@ main (int argc, char *argv[]) sname1 = elf_strptr (elf1, ehdr1->e_shstrndx, shdr1->sh_name); } while (scn1 != NULL - && ebl_section_strip_p (ebl1, ehdr1, shdr1, sname1, true, false)); + && ebl_section_strip_p (ebl1, shdr1, sname1, true, false)); GElf_Shdr shdr2_mem; GElf_Shdr *shdr2; @@ -267,7 +267,7 @@ main (int argc, char *argv[]) sname2 = elf_strptr (elf2, ehdr2->e_shstrndx, shdr2->sh_name); } while (scn2 != NULL - && ebl_section_strip_p (ebl2, ehdr2, shdr2, sname2, true, false)); + && ebl_section_strip_p (ebl2, shdr2, sname2, true, false)); if (scn1 == NULL || scn2 == NULL) break; diff --git a/src/strip.c b/src/strip.c index 1367de77..dc712364 100644 --- a/src/strip.c +++ b/src/strip.c @@ -817,7 +817,7 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname, /* Check whether the section can be removed. Since we will create a new .shstrtab assume it will be removed too. */ if (remove_shdrs ? !(shdr_info[cnt].shdr.sh_flags & SHF_ALLOC) - : (ebl_section_strip_p (ebl, ehdr, &shdr_info[cnt].shdr, + : (ebl_section_strip_p (ebl, &shdr_info[cnt].shdr, shdr_info[cnt].name, remove_comment, remove_debug) || cnt == ehdr->e_shstrndx @@ -978,7 +978,7 @@ handle_elf (int fd, Elf *elf, const char *prefix, const char *fname, original table in the debug file. Unless it is a redundant data marker to a debug (data only) section. */ - if (! (ebl_section_strip_p (ebl, ehdr, + if (! (ebl_section_strip_p (ebl, &shdr_info[scnidx].shdr, shdr_info[scnidx].name, remove_comment, |