[PATCH v4 12/21] modpost: unify 'sym' and 'to' in default_mismatch_handler()

Masahiro Yamada
2023-05-13T20:46:30Z

find_better_symbol() takes 'sym' and stores the return value to
another variable 'to'.

We can use the same variable because we want to replace the original
one if possible.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

scripts/mod/modpost.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index d2a9c655f6ea..9e81cd6803a7 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1160,11 +1160,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,
const struct sectioncheck* const mismatch,
- Elf_Rela *r, Elf_Sym *sym,
+ Elf_Rela *r, Elf_Sym *tsym,
unsigned int fsecndx, const char *fromsec,
const char *tosec)
{
- Elf_Sym *to;
Elf_Sym *from;
const char *tosym;
const char *fromsym;
@@ -1172,8 +1171,8 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,
from = find_nearest_symbol(elf, r->r_offset, fsecndx);
fromsym = sym_name(elf, from);

- to = find_better_symbol(elf, r->r_addend, sym);
- tosym = sym_name(elf, to);
+ tsym = find_better_symbol(elf, r->r_addend, tsym);
+ tosym = sym_name(elf, tsym);

/* check whitelist - we may ignore it */
if (!secref_whitelist(mismatch, fromsec, fromsym, tosec, tosym))
@@ -1208,7 +1207,7 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,
"You might get more information about where this is\n"
"coming from by using scripts/check_extable.sh %s\n",
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"
"section \"%s\" which is not in the list of\n"
"authorized sections. If you're adding a new section\n"
--
2.39.2