From: Nicholas Piggin <npiggin@gmail.com> To: linux-modules@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin <npiggin@gmail.com>, linux-kernel@vger.kernel.org, Michael Ellerman <mpe@ellerman.id.au>, Jessica Yu <jeyu@kernel.org>, Luis Chamberlain <mcgrof@kernel.org> Subject: [PATCH v5 1/2] module: add module_elf_check_arch for module-specific checks Date: Mon, 31 Oct 2022 22:07:32 +1000 [thread overview] Message-ID: <20221031120733.3956781-2-npiggin@gmail.com> (raw) In-Reply-To: <20221031120733.3956781-1-npiggin@gmail.com> The elf_check_arch() function is also used to test compatibility of usermode binaries. Kernel modules may have more specific requirements, for example powerpc would like to test for ABI version compatibility. Add a weak module_elf_check_arch() that defaults to true, and call it from elf_validity_check(). Cc: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Jessica Yu <jeyu@kernel.org> [np: added changelog, adjust name, rebase] Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- include/linux/moduleloader.h | 3 +++ kernel/module/main.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index 9e09d11ffe5b..7b4587a19189 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -13,6 +13,9 @@ * must be implemented by each architecture. */ +/* arch may override to do additional checking of ELF header architecture */ +bool module_elf_check_arch(Elf_Ehdr *hdr); + /* Adjust arch-specific sections. Return 0 on success. */ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, diff --git a/kernel/module/main.c b/kernel/module/main.c index d02d39c7174e..7b3f6fb0d428 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -1674,6 +1674,11 @@ static int elf_validity_check(struct load_info *info) info->hdr->e_machine); goto no_exec; } + if (!module_elf_check_arch(info->hdr)) { + pr_err("Invalid module architecture in ELF header: %u\n", + info->hdr->e_machine); + goto no_exec; + } if (info->hdr->e_shentsize != sizeof(Elf_Shdr)) { pr_err("Invalid ELF section header size\n"); goto no_exec; @@ -2247,6 +2252,11 @@ static void flush_module_icache(const struct module *mod) (unsigned long)mod->core_layout.base + mod->core_layout.size); } +bool __weak module_elf_check_arch(Elf_Ehdr *hdr) +{ + return true; +} + int __weak module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, char *secstrings, -- 2.37.2
WARNING: multiple messages have this Message-ID (diff)
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 1/2] module: add module_elf_check_arch for module-specific checks Date: Mon, 31 Oct 2022 22:07:32 +1000 [thread overview] Message-ID: <20221031120733.3956781-2-npiggin@gmail.com> (raw) In-Reply-To: <20221031120733.3956781-1-npiggin@gmail.com> The elf_check_arch() function is also used to test compatibility of usermode binaries. Kernel modules may have more specific requirements, for example powerpc would like to test for ABI version compatibility. Add a weak module_elf_check_arch() that defaults to true, and call it from elf_validity_check(). Cc: Michael Ellerman <mpe@ellerman.id.au> Signed-off-by: Jessica Yu <jeyu@kernel.org> [np: added changelog, adjust name, rebase] Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- include/linux/moduleloader.h | 3 +++ kernel/module/main.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index 9e09d11ffe5b..7b4587a19189 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -13,6 +13,9 @@ * must be implemented by each architecture. */ +/* arch may override to do additional checking of ELF header architecture */ +bool module_elf_check_arch(Elf_Ehdr *hdr); + /* Adjust arch-specific sections. Return 0 on success. */ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, diff --git a/kernel/module/main.c b/kernel/module/main.c index d02d39c7174e..7b3f6fb0d428 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -1674,6 +1674,11 @@ static int elf_validity_check(struct load_info *info) info->hdr->e_machine); goto no_exec; } + if (!module_elf_check_arch(info->hdr)) { + pr_err("Invalid module architecture in ELF header: %u\n", + info->hdr->e_machine); + goto no_exec; + } if (info->hdr->e_shentsize != sizeof(Elf_Shdr)) { pr_err("Invalid ELF section header size\n"); goto no_exec; @@ -2247,6 +2252,11 @@ static void flush_module_icache(const struct module *mod) (unsigned long)mod->core_layout.base + mod->core_layout.size); } +bool __weak module_elf_check_arch(Elf_Ehdr *hdr) +{ + return true; +} + int __weak module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, char *secstrings, -- 2.37.2
next prev parent reply other threads:[~2022-10-31 12:07 UTC|newest] Thread overview: 16+ 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 ` Nicholas Piggin 2022-10-31 12:07 ` Nicholas Piggin [this message] 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-11-02 23:59 ` Luis Chamberlain 2022-10-31 12:07 ` [PATCH v5 2/2] powerpc/64: Add module check for ELF ABI version Nicholas Piggin 2022-10-31 12:07 ` Nicholas Piggin 2022-11-03 8:35 ` Christophe Leroy 2022-11-03 8:35 ` Christophe Leroy 2022-11-07 12:14 ` Nicholas Piggin 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 0:01 ` Luis Chamberlain 2022-11-03 9:35 ` Michael Ellerman 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-2-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 \ --cc=mpe@ellerman.id.au \ /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.