summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSami Tolvanen <samitolvanen@google.com>2020-04-21 11:25:01 -0700
committerJosh Poimboeuf <jpoimboe@redhat.com>2020-05-28 11:06:05 -0500
commit1e968bf5caf65eff3f080102879aaa5440c261b6 (patch)
treee6fc5290b584765cb47aa41ac44471c88dea1778
parente000acc145928693833f09152244242a678d3cd5 (diff)
objtool: Use sh_info to find the base for .rela sections
ELF doesn't require .rela section names to match the base section. Use the section index in sh_info to find the section instead of looking it up by name. LLD, for example, generates a .rela section that doesn't match the base section name when we merge sections in a linker script for a binary compiled with -ffunction-sections. Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Reviewed-by: Kees Cook <keescook@chromium.org>
-rw-r--r--tools/objtool/elf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index f953d3a15612..5bc259c9d892 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -508,7 +508,7 @@ static int read_relas(struct elf *elf)
if (sec->sh.sh_type != SHT_RELA)
continue;
- sec->base = find_section_by_name(elf, sec->name + 5);
+ sec->base = find_section_by_index(elf, sec->sh.sh_info);
if (!sec->base) {
WARN("can't find base section for rela section %s",
sec->name);