Skip to content

Commit

Permalink
modpost: pass 'tosec' down to default_mismatch_handler()
Browse files Browse the repository at this point in the history
default_mismatch_handler() does not need to compute 'tosec' because
it is calculated by the caller.

Pass it down to default_mismatch_handler() instead of calling
sec_name() twice.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
  • Loading branch information
Masahiro Yamada committed May 22, 2023
1 parent 856567d commit dbf7cc2
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions scripts/mod/modpost.c
Original file line number Diff line number Diff line change
Expand Up @@ -1203,9 +1203,9 @@ static bool is_executable_section(struct elf_info *elf, unsigned int secndx)

static void default_mismatch_handler(const char *modname, struct elf_info *elf,
const struct sectioncheck* const mismatch,
Elf_Rela *r, Elf_Sym *sym, const char *fromsec)
Elf_Rela *r, Elf_Sym *sym, const char *fromsec,
const char *tosec)
{
const char *tosec;
Elf_Sym *to;
Elf_Sym *from;
const char *tosym;
Expand All @@ -1214,7 +1214,6 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,
from = find_elf_symbol2(elf, r->r_offset, fromsec);
fromsym = sym_name(elf, from);

tosec = sec_name(elf, get_secindex(elf, sym));
to = find_elf_symbol(elf, r->r_addend, sym);
tosym = sym_name(elf, to);

Expand Down Expand Up @@ -1276,7 +1275,7 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf,
if (!mismatch)
return;

default_mismatch_handler(modname, elf, mismatch, r, sym, fromsec);
default_mismatch_handler(modname, elf, mismatch, r, sym, fromsec, tosec);
}

static unsigned int *reloc_location(struct elf_info *elf,
Expand Down

0 comments on commit dbf7cc2

Please sign in to comment.