ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

modpost: factor out Elf_Sym pointer calculation to section_rel()

Browse Source 
Pass the Elf_Sym pointer to addend_arm_rel() as well as to
check_section_mismatch().

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
This commit is contained in:
Masahiro Yamada
2023-06-20 21:05:20 +09:00
parent b31db651f7
commit 8aa00e2c3d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/mod/modpost.c
View File

@@ -1295,10 +1295,9 @@ static int32_t sign_extend32(int32_t value, int index)
return (int32_t)(value << shift) >> shift; return (int32_t)(value << shift) >> shift;
} }
static int addend_arm_rel(void *loc, struct elf_info *elf, Elf_Rela *r) static int addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r)
{ {
unsigned int r_typ = ELF_R_TYPE(r->r_info); unsigned int r_typ = ELF_R_TYPE(r->r_info);
Elf_Sym *sym = elf->symtab_start + ELF_R_SYM(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;
@@ -1493,6 +1492,7 @@ static void section_rel(struct module *mod, struct elf_info *elf,
return; return;
for (rel = start; rel < stop; rel++) { for (rel = start; rel < stop; rel++) {
Elf_Sym *tsym;
void *loc; void *loc;
r.r_offset = TO_NATIVE(rel->r_offset); r.r_offset = TO_NATIVE(rel->r_offset);
@@ -1514,6 +1514,7 @@ static void section_rel(struct module *mod, struct elf_info *elf,
r.r_addend = 0; r.r_addend = 0;
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 + ELF_R_SYM(r.r_info);
switch (elf->hdr->e_machine) { switch (elf->hdr->e_machine) {
case EM_386: case EM_386:
@@ -1521,7 +1522,7 @@ static void section_rel(struct module *mod, struct elf_info *elf,
continue; continue;
break; break;
case EM_ARM: case EM_ARM:
if (addend_arm_rel(loc, elf, &r)) if (addend_arm_rel(loc, tsym, &r))
continue; continue;
break; break;
case EM_MIPS: case EM_MIPS:
@@ -1532,7 +1533,7 @@ static void section_rel(struct module *mod, struct elf_info *elf,
fatal("Please add code to calculate addend for this architecture\n"); fatal("Please add code to calculate addend for this architecture\n");
} }
check_section_mismatch(mod, elf, elf->symtab_start + r_sym, check_section_mismatch(mod, elf, tsym,
fsecndx, fromsec, r.r_offset, r.r_addend); fsecndx, fromsec, r.r_offset, r.r_addend);
} }
} }