Skip to content

Commit

Permalink
module: do not binary-search in __ksymtab_gpl if fsa->gplok is false
Browse files Browse the repository at this point in the history
Currently, !fsa->gplok && syms->license == GPL_ONLY) is checked after
bsearch() succeeds.

It is meaningless to do the binary search in the GPL symbol table when
fsa->gplok is false because we know find_exported_symbol_in_section()
will fail anyway.

This check should be done before bsearch().

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 c6eee9d commit cdd66eb
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions kernel/module/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,6 @@ static bool check_exported_symbol(const struct symsearch *syms,
struct module *owner, unsigned int symnum,
struct find_symbol_arg *fsa)
{
if (!fsa->gplok && syms->license == GPL_ONLY)
return false;
fsa->owner = owner;
fsa->crc = symversion(syms->crcs, symnum);
fsa->sym = &syms->start[symnum];
Expand Down Expand Up @@ -287,6 +285,9 @@ static bool find_exported_symbol_in_section(const struct symsearch *syms,
{
struct kernel_symbol *sym;

if (!fsa->gplok && syms->license == GPL_ONLY)
return false;

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

Expand Down

0 comments on commit cdd66eb

Please sign in to comment.