Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 21:33:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

modpost: continue even with unknown relocation type

Browse Source 
Currently, unknown relocation types are just skipped.

The value of r_addend is only needed to get the symbol name in case
is_valid_name(elf, sym) returns false.

Even if we do not know how to calculate r_addend, we should continue.
At worst, we will get "(unknown)" as the symbol name, but it is better
than failing to detect section mismatches.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2023-06-20 21:05:21 +09:00
parent 8aa00e2c3d
commit 8e86ebefdd
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/mod/modpost.c
View File

@ -1267,6 +1267,8 @@ static int addend_386_rel(uint32_t *location, Elf_Rela *r)
case R_386_PC32: case R_386_PC32:
r->r_addend = TO_NATIVE(*location) + 4; r->r_addend = TO_NATIVE(*location) + 4;
break; break;
default:
r->r_addend = (Elf_Addr)(-1);
} }
return 0; return 0;
} }
@ -1382,7 +1384,7 @@ static int addend_arm_rel(void *loc, Elf_Sym *sym, Elf_Rela *r)
r->r_addend = offset + sym->st_value + 4; r->r_addend = offset + sym->st_value + 4;
break; break;
default: default:
return 1; r->r_addend = (Elf_Addr)(-1);
} }
return 0; return 0;
} }
@ -1392,8 +1394,6 @@ static int addend_mips_rel(uint32_t *location, Elf_Rela *r)
unsigned int r_typ = ELF_R_TYPE(r->r_info); unsigned int r_typ = ELF_R_TYPE(r->r_info);
uint32_t inst; uint32_t inst;
if (r_typ == R_MIPS_HI16)
return 1; /* skip this */
inst = TO_NATIVE(*location); inst = TO_NATIVE(*location);
switch (r_typ) { switch (r_typ) {
case R_MIPS_LO16: case R_MIPS_LO16:
@ -1405,6 +1405,8 @@ static int addend_mips_rel(uint32_t *location, Elf_Rela *r)
case R_MIPS_32: case R_MIPS_32:
r->r_addend = inst; r->r_addend = inst;
break; break;
default:
r->r_addend = (Elf_Addr)(-1);
} }
return 0; return 0;
} }
@ -1514,20 +1516,17 @@ 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); tsym = elf->symtab_start + r_sym;
switch (elf->hdr->e_machine) { switch (elf->hdr->e_machine) {
case EM_386: case EM_386:
if (addend_386_rel(loc, &r)) addend_386_rel(loc, &r);
continue;
break; break;
case EM_ARM: case EM_ARM:
if (addend_arm_rel(loc, tsym, &r)) addend_arm_rel(loc, tsym, &r);
continue;
break; break;
case EM_MIPS: case EM_MIPS:
if (addend_mips_rel(loc, &r)) addend_mips_rel(loc, &r);
continue;
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");