From 1e968bf5caf65eff3f080102879aaa5440c261b6 Mon Sep 17 00:00:00 2001 From: Sami Tolvanen Date: Tue, 21 Apr 2020 11:25:01 -0700 Subject: 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 Signed-off-by: Josh Poimboeuf Reviewed-by: Kees Cook --- tools/objtool/elf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/objtool/elf.c') 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); -- cgit v1.2.3