summaryrefslogtreecommitdiff
path: root/kernel/module
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2022-05-05 12:52:12 +0900
committerLuis Chamberlain <mcgrof@kernel.org>2022-05-12 10:29:41 -0700
commit7390b94a3c2d93272d6da4945b81a9cf78055b7b (patch)
tree5a60367c132e8e9da57fa0d312e2bf25ed1531c2 /kernel/module
parentcdd66eb52fdaa9bdab7f1be8dc9162bf4acc64ae (diff)
module: merge check_exported_symbol() into find_exported_symbol_in_section()
Now check_exported_symbol() always succeeds. Merge it into find_exported_symbol_in_search() to make the code concise. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Diffstat (limited to 'kernel/module')
-rw-r--r--kernel/module/main.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/kernel/module/main.c b/kernel/module/main.c
index 8a068fff437c..fed58d30725d 100644
--- a/kernel/module/main.c
+++ b/kernel/module/main.c
@@ -243,17 +243,6 @@ static __maybe_unused void *any_section_objs(const struct load_info *info,
#define symversion(base, idx) ((base != NULL) ? ((base) + (idx)) : NULL)
#endif
-static bool check_exported_symbol(const struct symsearch *syms,
- struct module *owner, unsigned int symnum,
- struct find_symbol_arg *fsa)
-{
- fsa->owner = owner;
- fsa->crc = symversion(syms->crcs, symnum);
- fsa->sym = &syms->start[symnum];
- fsa->license = syms->license;
- return true;
-}
-
static const char *kernel_symbol_name(const struct kernel_symbol *sym)
{
#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
@@ -290,12 +279,15 @@ static bool find_exported_symbol_in_section(const struct symsearch *syms,
sym = bsearch(fsa->name, syms->start, syms->stop - syms->start,
sizeof(struct kernel_symbol), cmp_name);
+ if (!sym)
+ return false;
- if (sym != NULL && check_exported_symbol(syms, owner,
- sym - syms->start, fsa))
- return true;
+ fsa->owner = owner;
+ fsa->crc = symversion(syms->crcs, sym - syms->start);
+ fsa->sym = sym;
+ fsa->license = syms->license;
- return false;
+ return true;
}
/*