From: Masahiro Yamada <masahiroy@kernel.org>
To: Luis Chamberlain <mcgrof@kernel.org>,
linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH 2/3] module: do not binary-search in __ksymtab_gpl if fsa->gplok is false
Date: Thu, 5 May 2022 04:42:44 +0900 [thread overview]
Message-ID: <20220504194245.1088063-3-masahiroy@kernel.org> (raw)
In-Reply-To: <20220504194245.1088063-1-masahiroy@kernel.org>
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>
---
kernel/module.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/module.c b/kernel/module.c
index d57beb6b4eee..4380ceb825b9 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -448,8 +448,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];
@@ -497,6 +495,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);
--
2.32.0
next prev parent reply other threads:[~2022-05-04 19:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 19:42 [PATCH 0/3] module: trivial cleanups for symbol search Masahiro Yamada
2022-05-04 19:42 ` [PATCH 1/3] module: do not pass opaque pointer " Masahiro Yamada
2022-05-04 19:42 ` Masahiro Yamada [this message]
2022-05-04 19:42 ` [PATCH 3/3] module: merge check_exported_symbol() into find_exported_symbol_in_section() Masahiro Yamada
2022-05-04 20:22 ` [PATCH 0/3] module: trivial cleanups for symbol search Luis Chamberlain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220504194245.1088063-3-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=mcgrof@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).