bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-26 14:17:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

objtool: Fix type of reloc::addend

Browse source 
Elf{32,64}_Rela::r_addend is of type: Elf{32,64}_Sword, that means
that our reloc::addend needs to be long or face tuncation issues when
we do elf_rebuild_reloc_section():

  - 107:  48 b8 00 00 00 00 00 00 00 00   movabs $0x0,%rax        109: R_X86_64_64        level4_kernel_pgt+0x80000067
  + 107:  48 b8 00 00 00 00 00 00 00 00   movabs $0x0,%rax        109: R_X86_64_64        level4_kernel_pgt-0x7fffff99

Fixes: 627fce1480 ("objtool: Add ORC unwind table generation")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lkml.kernel.org/r/20220419203807.596871927@infradead.org
This commit is contained in:
Peter Zijlstra 2022-04-17 17:03:40 +02:00
parent 08feafe8d1
commit c087c6e7b5
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/objtool/check.c
View file

@ -559,12 +559,12 @@ static int add_dead_ends(struct objtool_file *file)
else if (reloc->addend == reloc->sym->sec->sh.sh_size) { else if (reloc->addend == reloc->sym->sec->sh.sh_size) {
insn = find_last_insn(file, reloc->sym->sec); insn = find_last_insn(file, reloc->sym->sec);
if (!insn) { if (!insn) {
WARN("can't find unreachable insn at %s+0x%x", WARN("can't find unreachable insn at %s+0x%lx",
reloc->sym->sec->name, reloc->addend); reloc->sym->sec->name, reloc->addend);
return -1; return -1;
} }
} else { } else {
WARN("can't find unreachable insn at %s+0x%x", WARN("can't find unreachable insn at %s+0x%lx",
reloc->sym->sec->name, reloc->addend); reloc->sym->sec->name, reloc->addend);
return -1; return -1;
} }
@ -594,12 +594,12 @@ reachable:
else if (reloc->addend == reloc->sym->sec->sh.sh_size) { else if (reloc->addend == reloc->sym->sec->sh.sh_size) {
insn = find_last_insn(file, reloc->sym->sec); insn = find_last_insn(file, reloc->sym->sec);
if (!insn) { if (!insn) {
WARN("can't find reachable insn at %s+0x%x", WARN("can't find reachable insn at %s+0x%lx",
reloc->sym->sec->name, reloc->addend); reloc->sym->sec->name, reloc->addend);
return -1; return -1;
} }
} else { } else {
WARN("can't find reachable insn at %s+0x%x", WARN("can't find reachable insn at %s+0x%lx",
reloc->sym->sec->name, reloc->addend); reloc->sym->sec->name, reloc->addend);
return -1; return -1;
} }

2
tools/objtool/elf.c
View file

@ -546,7 +546,7 @@ static struct section *elf_create_reloc_section(struct elf *elf,
int reltype); int reltype);
int elf_add_reloc(struct elf *elf, struct section *sec, unsigned long offset, int elf_add_reloc(struct elf *elf, struct section *sec, unsigned long offset,
unsigned int type, struct symbol *sym, int addend) unsigned int type, struct symbol *sym, long addend)
{ {
struct reloc *reloc; struct reloc *reloc;

4
tools/objtool/include/objtool/elf.h
View file

@ -73,7 +73,7 @@ struct reloc {
struct symbol *sym; struct symbol *sym;
unsigned long offset; unsigned long offset;
unsigned int type; unsigned int type;
int addend; long addend;
int idx; int idx;
bool jump_table_start; bool jump_table_start;
}; };
@ -135,7 +135,7 @@ struct elf *elf_open_read(const char *name, int flags);
struct section *elf_create_section(struct elf *elf, const char *name, unsigned int sh_flags, size_t entsize, int nr); struct section *elf_create_section(struct elf *elf, const char *name, unsigned int sh_flags, size_t entsize, int nr);
int elf_add_reloc(struct elf *elf, struct section *sec, unsigned long offset, int elf_add_reloc(struct elf *elf, struct section *sec, unsigned long offset,
unsigned int type, struct symbol *sym, int addend); unsigned int type, struct symbol *sym, long addend);
int elf_add_reloc_to_insn(struct elf *elf, struct section *sec, int elf_add_reloc_to_insn(struct elf *elf, struct section *sec,
unsigned long offset, unsigned int type, unsigned long offset, unsigned int type,
struct section *insn_sec, unsigned long insn_off); struct section *insn_sec, unsigned long insn_off);