From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: linux-s390@vger.kernel.org, Nicolas Schier <nicolas@fjasle.eu>, Peter Zijlstra <peterz@infradead.org>, Masahiro Yamada <masahiroy@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, linux-kernel@vger.kernel.org, Nathan Chancellor <nathan@kernel.org>, clang-built-linux@googlegroups.com, Sami Tolvanen <samitolvanen@google.com>, linuxppc-dev@lists.ozlabs.org, Ard Biesheuvel <ardb@kernel.org>, linux-modules@vger.kernel.org Subject: [PATCH v4 04/14] modpost: add sym_find_with_module() helper Date: Mon, 9 May 2022 04:06:21 +0900 [thread overview] Message-ID: <20220508190631.2386038-5-masahiroy@kernel.org> (raw) In-Reply-To: <20220508190631.2386038-1-masahiroy@kernel.org> find_symbol() returns the first symbol found in the hash table. This table is global, so it may return a symbol from an unexpected module. There is a case where we want to search for a symbol with a given name in a specified module. Add sym_find_with_module(), which receives the module pointer as the second argument. It is equivalent to find_module() if NULL is passed as the module pointer. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> Tested-by: Nathan Chancellor <nathan@kernel.org> --- Changes in v4: - Only takes the new helper from https://patchwork.kernel.org/project/linux-kbuild/patch/20220505072244.1155033-2-masahiroy@kernel.org/ Changes in v2: - Rename the new func to sym_find_with_module() scripts/mod/modpost.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index e7e2c70a98f5..fc5db1f73cf1 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -266,7 +266,7 @@ static void sym_add_unresolved(const char *name, struct module *mod, bool weak) list_add_tail(&sym->list, &mod->unresolved_symbols); } -static struct symbol *find_symbol(const char *name) +static struct symbol *sym_find_with_module(const char *name, struct module *mod) { struct symbol *s; @@ -275,12 +275,17 @@ static struct symbol *find_symbol(const char *name) name++; for (s = symbolhash[tdb_hash(name) % SYMBOL_HASH_SIZE]; s; s = s->next) { - if (strcmp(s->name, name) == 0) + if (strcmp(s->name, name) == 0 && (!mod || s->module == mod)) return s; } return NULL; } +static struct symbol *find_symbol(const char *name) +{ + return sym_find_with_module(name, NULL); +} + struct namespace_list { struct list_head list; char namespace[]; -- 2.32.0
WARNING: multiple messages have this Message-ID (diff)
From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nicolas Schier <nicolas@fjasle.eu>, Peter Zijlstra <peterz@infradead.org>, linux-modules@vger.kernel.org, linux-s390@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, clang-built-linux@googlegroups.com, Ard Biesheuvel <ardb@kernel.org>, Sami Tolvanen <samitolvanen@google.com>, Masahiro Yamada <masahiroy@kernel.org> Subject: [PATCH v4 04/14] modpost: add sym_find_with_module() helper Date: Mon, 9 May 2022 04:06:21 +0900 [thread overview] Message-ID: <20220508190631.2386038-5-masahiroy@kernel.org> (raw) In-Reply-To: <20220508190631.2386038-1-masahiroy@kernel.org> find_symbol() returns the first symbol found in the hash table. This table is global, so it may return a symbol from an unexpected module. There is a case where we want to search for a symbol with a given name in a specified module. Add sym_find_with_module(), which receives the module pointer as the second argument. It is equivalent to find_module() if NULL is passed as the module pointer. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> Tested-by: Nathan Chancellor <nathan@kernel.org> --- Changes in v4: - Only takes the new helper from https://patchwork.kernel.org/project/linux-kbuild/patch/20220505072244.1155033-2-masahiroy@kernel.org/ Changes in v2: - Rename the new func to sym_find_with_module() scripts/mod/modpost.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index e7e2c70a98f5..fc5db1f73cf1 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -266,7 +266,7 @@ static void sym_add_unresolved(const char *name, struct module *mod, bool weak) list_add_tail(&sym->list, &mod->unresolved_symbols); } -static struct symbol *find_symbol(const char *name) +static struct symbol *sym_find_with_module(const char *name, struct module *mod) { struct symbol *s; @@ -275,12 +275,17 @@ static struct symbol *find_symbol(const char *name) name++; for (s = symbolhash[tdb_hash(name) % SYMBOL_HASH_SIZE]; s; s = s->next) { - if (strcmp(s->name, name) == 0) + if (strcmp(s->name, name) == 0 && (!mod || s->module == mod)) return s; } return NULL; } +static struct symbol *find_symbol(const char *name) +{ + return sym_find_with_module(name, NULL); +} + struct namespace_list { struct list_head list; char namespace[]; -- 2.32.0
next prev parent reply other threads:[~2022-05-08 19:10 UTC|newest] Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-08 19:06 [PATCH v4 00/14] kbuild: yet another series of cleanups (modpost, LTO, MODULE_REL_CRCS, export.h) Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 01/14] modpost: remove left-over cross_compile declaration Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-09 17:08 ` Nick Desaulniers 2022-05-09 17:08 ` Nick Desaulniers 2022-05-12 4:35 ` Masahiro Yamada 2022-05-12 4:35 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 02/14] modpost: change the license of EXPORT_SYMBOL to bool type Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-12 4:36 ` Masahiro Yamada 2022-05-12 4:36 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 03/14] modpost: split the section mismatch checks into section-check.c Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-09 17:19 ` Nick Desaulniers 2022-05-09 17:19 ` Nick Desaulniers 2022-05-10 6:55 ` Masahiro Yamada 2022-05-10 6:55 ` Masahiro Yamada 2022-05-11 18:47 ` Nick Desaulniers 2022-05-11 18:47 ` Nick Desaulniers 2022-05-11 19:27 ` Masahiro Yamada 2022-05-11 19:27 ` Masahiro Yamada 2022-05-11 19:51 ` Jeff Johnson 2022-05-11 19:51 ` Jeff Johnson 2022-05-11 20:01 ` Nick Desaulniers 2022-05-11 20:01 ` Nick Desaulniers 2022-05-08 19:06 ` Masahiro Yamada [this message] 2022-05-08 19:06 ` [PATCH v4 04/14] modpost: add sym_find_with_module() helper Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 05/14] modpost: extract symbol versions from *.cmd files Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-09 21:52 ` Sami Tolvanen 2022-05-09 21:52 ` Sami Tolvanen 2022-05-08 19:06 ` [PATCH v4 06/14] kbuild: link symbol CRCs at final link, removing CONFIG_MODULE_REL_CRCS Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-09 17:50 ` Nick Desaulniers 2022-05-09 17:50 ` Nick Desaulniers 2022-05-10 13:03 ` Masahiro Yamada 2022-05-10 13:03 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 07/14] kbuild: stop merging *.symversions Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 08/14] genksyms: adjust the output format to modpost Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 09/14] kbuild: do not create *.prelink.o for Clang LTO or IBT Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-09 23:13 ` Sami Tolvanen 2022-05-09 23:13 ` Sami Tolvanen 2022-05-08 19:06 ` [PATCH v4 10/14] kbuild: check static EXPORT_SYMBOL* by script instead of modpost Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-09 18:05 ` Nick Desaulniers 2022-05-09 18:05 ` Nick Desaulniers 2022-05-10 13:53 ` Masahiro Yamada 2022-05-10 13:53 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 11/14] kbuild: make built-in.a rule robust against too long argument error Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 12/14] kbuild: make *.mod " Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 13/14] kbuild: add cmd_and_savecmd macro Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-08 19:06 ` [PATCH v4 14/14] kbuild: rebuild multi-object modules when objtool is updated Masahiro Yamada 2022-05-08 19:06 ` Masahiro Yamada 2022-05-09 4:24 ` [PATCH v4 00/14] kbuild: yet another series of cleanups (modpost, LTO, MODULE_REL_CRCS, export.h) Masahiro Yamada 2022-05-09 4:24 ` Masahiro Yamada 2022-05-09 22:13 ` Nathan Chancellor 2022-05-09 22:13 ` Nathan Chancellor 2022-05-10 6:55 ` Masahiro Yamada 2022-05-10 6:55 ` Masahiro Yamada 2022-05-09 22:19 ` Nathan Chancellor 2022-05-09 22:19 ` Nathan Chancellor
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=20220508190631.2386038-5-masahiroy@kernel.org \ --to=masahiroy@kernel.org \ --cc=ardb@kernel.org \ --cc=clang-built-linux@googlegroups.com \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-modules@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=nathan@kernel.org \ --cc=ndesaulniers@google.com \ --cc=nicolas@fjasle.eu \ --cc=peterz@infradead.org \ --cc=samitolvanen@google.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.