Skip to content

Commit

Permalink
module: do not pass opaque pointer for symbol search
Browse files Browse the repository at this point in the history
There is no need to use an opaque pointer for check_exported_symbol()
or find_exported_symbol_in_section.

Pass (struct find_symbol_arg *) explicitly.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
  • Loading branch information
Masahiro Yamada authored and Luis Chamberlain committed May 12, 2022
1 parent 8eac910 commit c6eee9d
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions kernel/module/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,9 @@ static __maybe_unused void *any_section_objs(const struct load_info *info,
#endif

static bool check_exported_symbol(const struct symsearch *syms,
struct module *owner,
unsigned int symnum, void *data)
struct module *owner, unsigned int symnum,
struct find_symbol_arg *fsa)
{
struct find_symbol_arg *fsa = data;

if (!fsa->gplok && syms->license == GPL_ONLY)
return false;
fsa->owner = owner;
Expand Down Expand Up @@ -285,16 +283,15 @@ int cmp_name(const void *name, const void *sym)

static bool find_exported_symbol_in_section(const struct symsearch *syms,
struct module *owner,
void *data)
struct find_symbol_arg *fsa)
{
struct find_symbol_arg *fsa = data;
struct kernel_symbol *sym;

sym = bsearch(fsa->name, syms->start, syms->stop - syms->start,
sizeof(struct kernel_symbol), cmp_name);

if (sym != NULL && check_exported_symbol(syms, owner,
sym - syms->start, data))
sym - syms->start, fsa))
return true;

return false;
Expand Down

0 comments on commit c6eee9d

Please sign in to comment.