diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2022-05-05 12:52:11 +0900 |
|---|---|---|
| committer | Luis Chamberlain <mcgrof@kernel.org> | 2022-05-12 10:29:41 -0700 |
| commit | cdd66eb52fdaa9bdab7f1be8dc9162bf4acc64ae (patch) | |
| tree | 47bff8f5ca3ca2889c69b29c557fc39e486fd1f8 /kernel/module | |
| parent | c6eee9df57a6d9252bae93a9386d0d872798f5d5 (diff) | |
| download | linux-cdd66eb52fdaa9bdab7f1be8dc9162bf4acc64ae.tar.gz linux-cdd66eb52fdaa9bdab7f1be8dc9162bf4acc64ae.tar.bz2 linux-cdd66eb52fdaa9bdab7f1be8dc9162bf4acc64ae.zip | |
module: do not binary-search in __ksymtab_gpl if fsa->gplok is false
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>
Diffstat (limited to 'kernel/module')
| -rw-r--r-- | kernel/module/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/module/main.c b/kernel/module/main.c index d00a8de6d8f5..8a068fff437c 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -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]; @@ -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); |