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>

diff --git a/kernel/module/main.c b/kernel/module/main.c
index d00a8de6d8f54e1ac2f7f16a35288aa3b19a830e..8a068fff437c0c507d05d9936ed8eae9b0dea109 100644 (file)
--- 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);