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>,
linux-um@lists.infradead.org,
Masahiro Yamada <masahiroy@kernel.org>
Subject: [PATCH v7 09/11] modpost: merge two similar section mismatch warnings
Date: Thu, 8 Jun 2023 23:24:26 +0900 [thread overview]
Message-ID: <20230608142428.256985-10-masahiroy@kernel.org> (raw)
In-Reply-To: <20230608142428.256985-1-masahiroy@kernel.org>
In case of section mismatch, modpost shows slightly different messages.
For extable section mismatch:
"%s(%s+0x%lx): Section mismatch in reference to the %s:%s\n"
For the other cases:
"%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n"
They are similar. Merge them.
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
---
scripts/mod/modpost.c | 18 +++---------------
1 file changed, 3 insertions(+), 15 deletions(-)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index decb7d23ef9f..85df3f3ba9ee 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1147,21 +1147,10 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,
sec_mismatch_count++;
- switch (mismatch->mismatch) {
- case TEXT_TO_ANY_INIT:
- case DATA_TO_ANY_INIT:
- case TEXTDATA_TO_ANY_EXIT:
- case XXXINIT_TO_SOME_INIT:
- case XXXEXIT_TO_SOME_EXIT:
- case ANY_INIT_TO_ANY_EXIT:
- case ANY_EXIT_TO_ANY_INIT:
- warn("%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n",
- modname, fromsym, fromsec, tosym, tosec);
- break;
- case EXTABLE_TO_NON_TEXT:
- warn("%s(%s+0x%lx): Section mismatch in reference to the %s:%s\n",
- modname, fromsec, (long)faddr, tosec, tosym);
+ warn("%s: section mismatch in reference: %s (section: %s) -> %s (section: %s)\n",
+ modname, fromsym, fromsec, tosym, tosec);
+ if (mismatch->mismatch == EXTABLE_TO_NON_TEXT) {
if (match(tosec, mismatch->bad_tosec))
fatal("The relocation at %s+0x%lx references\n"
"section \"%s\" which is black-listed.\n"
@@ -1181,7 +1170,6 @@ static void default_mismatch_handler(const char *modname, struct elf_info *elf,
else
error("%s+0x%lx references non-executable section '%s'\n",
fromsec, (long)faddr, tosec);
- break;
}
}
--
2.39.2
next prev parent reply other threads:[~2023-06-08 14:25 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-08 14:24 [PATCH v7 00/11] Unify <linux/export.h> and <asm/export.h>, remove EXPORT_DATA_SYMBOL(), faster TRIM_UNUSED_KSYMS Masahiro Yamada
2023-06-08 14:24 ` [PATCH v7 01/11] Revert "[PATCH] uml: export symbols added by GCC hardened" Masahiro Yamada
2023-06-09 21:23 ` Nick Desaulniers
2023-06-08 14:24 ` [PATCH v7 02/11] modpost: pass struct module pointer to check_section_mismatch() Masahiro Yamada
2023-06-08 14:24 ` [PATCH v7 03/11] kbuild: generate KSYMTAB entries by modpost Masahiro Yamada
2023-06-09 21:34 ` Nick Desaulniers
2023-06-10 8:56 ` Masahiro Yamada
2023-06-21 16:15 ` Guenter Roeck
2023-06-22 2:26 ` Masahiro Yamada
2023-06-22 16:20 ` Nick Desaulniers
2023-06-08 14:24 ` [PATCH v7 04/11] ia64,export.h: replace EXPORT_DATA_SYMBOL* with EXPORT_SYMBOL* Masahiro Yamada
2023-06-08 14:24 ` [PATCH v7 05/11] modpost: check static EXPORT_SYMBOL* by modpost again Masahiro Yamada
2023-06-08 14:24 ` [PATCH v7 06/11] modpost: squash sym_update_namespace() into sym_add_exported() Masahiro Yamada
2023-06-08 14:24 ` [PATCH v7 07/11] modpost: use null string instead of NULL pointer for default namespace Masahiro Yamada
2023-06-08 14:24 ` [PATCH v7 08/11] kbuild: implement CONFIG_TRIM_UNUSED_KSYMS without recursion Masahiro Yamada
2023-06-08 14:24 ` Masahiro Yamada [this message]
2023-06-08 14:24 ` [PATCH v7 10/11] modpost: show offset from symbol for section mismatch warnings Masahiro Yamada
2023-06-09 21:26 ` Nick Desaulniers
2023-06-08 14:24 ` [PATCH v7 11/11] linux/export.h: rename 'sec' argument to 'license' Masahiro Yamada
2023-06-09 21:29 ` Nick Desaulniers
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=20230608142428.256985-10-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).