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

modpost: unify 'sym' and 'to' in default_mismatch_handler()

Browse Source 
find_tosym() takes 'sym' and stores the return value to another
variable 'to'. You can use the same variable because we want to
replace the original one when appropriate.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
This commit is contained in:
Masahiro Yamada 2023-05-22 01:04:11 +09:00
parent 05bb070467
commit a23e7584ec
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/mod/modpost.c
View File

@ -1185,11 +1185,10 @@ static bool is_executable_section(struct elf_info *elf, unsigned int secndx)
static void default_mismatch_handler(const char *modname, struct elf_info *elf, static void default_mismatch_handler(const char *modname, struct elf_info *elf,
const struct sectioncheck* const mismatch, const struct sectioncheck* const mismatch,
Elf_Rela *r, Elf_Sym *sym, Elf_Rela *r, Elf_Sym *tsym,
unsigned int fsecndx, const char *fromsec, unsigned int fsecndx, const char *fromsec,
const char *tosec) const char *tosec)
{ {
Elf_Sym *to;
Elf_Sym *from; Elf_Sym *from;
const char *tosym; const char *tosym;
const char *fromsym; const char *fromsym;
@ -1197,8 +1196,8 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,
from = find_fromsym(elf, r->r_offset, fsecndx); from = find_fromsym(elf, r->r_offset, fsecndx);
fromsym = sym_name(elf, from); fromsym = sym_name(elf, from);
to = find_tosym(elf, r->r_addend, sym); tsym = find_tosym(elf, r->r_addend, tsym);
tosym = sym_name(elf, to); tosym = sym_name(elf, tsym);
/* check whitelist - we may ignore it */ /* check whitelist - we may ignore it */
if (!secref_whitelist(fromsec, fromsym, tosec, tosym)) if (!secref_whitelist(fromsec, fromsym, tosec, tosym))
@ -1233,7 +1232,7 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,
"You might get more information about where this is\n" "You might get more information about where this is\n"
"coming from by using scripts/check_extable.sh %s\n", "coming from by using scripts/check_extable.sh %s\n",
fromsec, (long)r->r_offset, tosec, modname); fromsec, (long)r->r_offset, tosec, modname);
else if (is_executable_section(elf, get_secindex(elf, sym))) else if (is_executable_section(elf, get_secindex(elf, tsym)))
warn("The relocation at %s+0x%lx references\n" warn("The relocation at %s+0x%lx references\n"
"section \"%s\" which is not in the list of\n" "section \"%s\" which is not in the list of\n"
"authorized sections. If you're adding a new section\n" "authorized sections. If you're adding a new section\n"