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 3/3] module: merge check_exported_symbol() into find_exported_symbol_in_section()
Date: Thu, 5 May 2022 04:42:45 +0900 [thread overview]
Message-ID: <20220504194245.1088063-4-masahiroy@kernel.org> (raw)
In-Reply-To: <20220504194245.1088063-1-masahiroy@kernel.org>
Now check_exported_symbol() always succeeds.
Merge it into find_exported_symbol_in_search() to make the code concise.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---
kernel/module.c | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/kernel/module.c b/kernel/module.c
index 4380ceb825b9..6b2afce80c32 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -444,17 +444,6 @@ struct find_symbol_arg {
enum mod_license license;
};
-static bool check_exported_symbol(const struct symsearch *syms,
- struct module *owner, unsigned int symnum,
- struct find_symbol_arg *fsa)
-{
- fsa->owner = owner;
- fsa->crc = symversion(syms->crcs, symnum);
- fsa->sym = &syms->start[symnum];
- fsa->license = syms->license;
- return true;
-}
-
static unsigned long kernel_symbol_value(const struct kernel_symbol *sym)
{
#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
@@ -500,12 +489,15 @@ static bool find_exported_symbol_in_section(const struct symsearch *syms,
sym = bsearch(fsa->name, syms->start, syms->stop - syms->start,
sizeof(struct kernel_symbol), cmp_name);
+ if (!sym)
+ return false;
- if (sym != NULL && check_exported_symbol(syms, owner,
- sym - syms->start, fsa))
- return true;
+ fsa->owner = owner;
+ fsa->crc = symversion(syms->crcs, sym - syms->start);
+ fsa->sym = sym;
+ fsa->license = syms->license;
- return false;
+ return true;
}
/*
--
2.32.0
next prev parent reply other threads:[~2022-05-04 19:47 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 ` [PATCH 2/3] module: do not binary-search in __ksymtab_gpl if fsa->gplok is false Masahiro Yamada
2022-05-04 19:42 ` Masahiro Yamada [this message]
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-4-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).