alex/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modpost: pass r_type to addend_*_rel()

Browse Source 
All of addend_*_rel() need the Elf_Rela pointer just for calculating
ELF_R_TYPE(r->r_info).

You can do it on the caller to de-duplicate the code.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2023-07-23 19:04:44 +09:00
parent a68914a534
commit 71d965cf35
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/mod/modpost.c
View File

@ -1257,11 +1257,9 @@ static void check_section_mismatch(struct module *mod, struct elf_info *elf,
tosec, taddr); tosec, taddr);
} }
static Elf_Addr addend_386_rel(uint32_t *location, Elf_Rela *r) static Elf_Addr addend_386_rel(uint32_t *location, unsigned int r_type)
{ {
unsigned int r_typ = ELF_R_TYPE(r->r_info); switch (r_type) {
switch (r_typ) {
case R_386_32: case R_386_32:
return TO_NATIVE(*location); return TO_NATIVE(*location);
case R_386_PC32: case R_386_PC32:
@ -1312,13 +1310,12 @@ static int32_t sign_extend32(int32_t value, int index)
return (int32_t)(value << shift) >> shift; return (int32_t)(value << shift) >> shift;
} }
static Elf_Addr addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r) static Elf_Addr addend_arm_rel(void *loc, Elf_Sym *sym, unsigned int r_type)
{ {
unsigned int r_typ = ELF_R_TYPE(r->r_info);
uint32_t inst, upper, lower, sign, j1, j2; uint32_t inst, upper, lower, sign, j1, j2;
int32_t offset; int32_t offset;
switch (r_typ) { switch (r_type) {
case R_ARM_ABS32: case R_ARM_ABS32:
case R_ARM_REL32: case R_ARM_REL32:
inst = TO_NATIVE(*(uint32_t *)loc); inst = TO_NATIVE(*(uint32_t *)loc);
@ -1397,13 +1394,12 @@ static Elf_Addr addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r)
return (Elf_Addr)(-1); return (Elf_Addr)(-1);
} }
static Elf_Addr addend_mips_rel(uint32_t *location, Elf_Rela *r) static Elf_Addr addend_mips_rel(uint32_t *location, unsigned int r_type)
{ {
unsigned int r_typ = ELF_R_TYPE(r->r_info);
uint32_t inst; uint32_t inst;
inst = TO_NATIVE(*location); inst = TO_NATIVE(*location);
switch (r_typ) { switch (r_type) {
case R_MIPS_LO16: case R_MIPS_LO16:
return inst & 0xffff; return inst & 0xffff;
case R_MIPS_26: case R_MIPS_26:
@ -1500,6 +1496,7 @@ static void section_rel(struct module *mod, struct elf_info *elf,
Elf_Sym *tsym; Elf_Sym *tsym;
Elf_Addr taddr = 0; Elf_Addr taddr = 0;
void *loc; void *loc;
unsigned int r_type;
r.r_offset = TO_NATIVE(rel->r_offset); r.r_offset = TO_NATIVE(rel->r_offset);
#if KERNEL_ELFCLASS == ELFCLASS64 #if KERNEL_ELFCLASS == ELFCLASS64
@ -1520,16 +1517,17 @@ static void section_rel(struct module *mod, struct elf_info *elf,
loc = sym_get_data_by_offset(elf, fsecndx, r.r_offset); loc = sym_get_data_by_offset(elf, fsecndx, r.r_offset);
tsym = elf->symtab_start + r_sym; tsym = elf->symtab_start + r_sym;
r_type = ELF_R_TYPE(r.r_info);
switch (elf->hdr->e_machine) { switch (elf->hdr->e_machine) {
case EM_386: case EM_386:
taddr = addend_386_rel(loc, &r); taddr = addend_386_rel(loc, r_type);
break; break;
case EM_ARM: case EM_ARM:
taddr = addend_arm_rel(loc, tsym, &r); taddr = addend_arm_rel(loc, tsym, r_type);
break; break;
case EM_MIPS: case EM_MIPS:
taddr = addend_mips_rel(loc, &r); taddr = addend_mips_rel(loc, r_type);
break; break;
default: default:
fatal("Please add code to calculate addend for this architecture\n"); fatal("Please add code to calculate addend for this architecture\n");