From: Nicholas Piggin <npiggin@gmail.com>
To: linux-modules@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Cc: Luis Chamberlain <mcgrof@kernel.org>,
linux-kernel@vger.kernel.org, Nicholas Piggin <npiggin@gmail.com>,
Jessica Yu <jeyu@kernel.org>
Subject: [PATCH v5 2/2] powerpc/64: Add module check for ELF ABI version
Date: Mon, 31 Oct 2022 22:07:33 +1000 [thread overview]
Message-ID: <20221031120733.3956781-3-npiggin@gmail.com> (raw)
In-Reply-To: <20221031120733.3956781-1-npiggin@gmail.com>
Override the generic module ELF check to provide a check for the ELF ABI
version. This becomes important if we allow big-endian ELF ABI V2 builds
but it doesn't hurt to check now.
Cc: Jessica Yu <jeyu@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
[np: split patch, added changelog, adjust to Jessica's proposal]
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
arch/powerpc/kernel/module.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
index f6d6ae0a1692..d46bf9bfda26 100644
--- a/arch/powerpc/kernel/module.c
+++ b/arch/powerpc/kernel/module.c
@@ -19,6 +19,23 @@
static LIST_HEAD(module_bug_list);
+#ifdef CONFIG_PPC64
+bool module_elf_check_arch(Elf_Ehdr *hdr)
+{
+ unsigned long abi_level = hdr->e_flags & 0x3;
+
+ if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V2)) {
+ if (abi_level != 2)
+ return false;
+ } else {
+ if (abi_level >= 2)
+ return false;
+ }
+
+ return true;
+}
+#endif
+
static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
const char *name)
--
2.37.2
next prev parent reply other threads:[~2022-10-31 12:10 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 12:07 [PATCH v5 0/2] powerpc module arch checks Nicholas Piggin
2022-10-31 12:07 ` [PATCH v5 1/2] module: add module_elf_check_arch for module-specific checks Nicholas Piggin
2022-11-02 23:59 ` Luis Chamberlain
2022-10-31 12:07 ` Nicholas Piggin [this message]
2022-11-03 8:35 ` [PATCH v5 2/2] powerpc/64: Add module check for ELF ABI version Christophe Leroy
2022-11-07 12:14 ` Nicholas Piggin
2022-11-03 0:01 ` [PATCH v5 0/2] powerpc module arch checks Luis Chamberlain
2022-11-03 9:35 ` Michael Ellerman
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=20221031120733.3956781-3-npiggin@gmail.com \
--to=npiggin@gmail.com \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.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).