From: Mark Brown <broonie@kernel.org>
To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: Szabolcs Nagy <szabolcs.nagy@arm.com>,
Jeremy Linton <jeremy.linton@arm.com>,
"H . J . Lu" <hjl.tools@gmail.com>,
Yu-cheng Yu <yu-cheng.yu@intel.com>,
linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
libc-alpha@sourceware.org, Mark Brown <broonie@kernel.org>,
Dave Martin <Dave.Martin@arm.com>
Subject: [PATCH v8 3/4] elf: Remove has_interp property from arch_adjust_elf_prot()
Date: Mon, 24 Jan 2022 15:07:03 +0000 [thread overview]
Message-ID: <20220124150704.2559523-4-broonie@kernel.org> (raw)
In-Reply-To: <20220124150704.2559523-1-broonie@kernel.org>
Since we have added an is_interp flag to arch_parse_elf_property() we can
drop the has_interp flag from arch_elf_adjust_prot(), the only user was
the arm64 code which no longer needs it and any future users will be able
to use arch_parse_elf_properties() to determine if an interpreter is in
use.
Signed-off-by: Mark Brown <broonie@kernel.org>
Tested-by: Jeremy Linton <jeremy.linton@arm.com>
Reviewed-By: Dave Martin <Dave.Martin@arm.com>
---
arch/arm64/kernel/process.c | 2 +-
fs/binfmt_elf.c | 2 +-
include/linux/elf.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 8157910a4181..8017d963be3f 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -702,7 +702,7 @@ core_initcall(tagged_addr_init);
#ifdef CONFIG_BINFMT_ELF
int arch_elf_adjust_prot(int prot, const struct arch_elf_state *state,
- bool has_interp, bool is_interp)
+ bool is_interp)
{
if ((prot & PROT_EXEC) &&
(state->flags & arm64_elf_bti_flag(is_interp)))
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index eabd7e0f6592..c1620358ab77 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -580,7 +580,7 @@ static inline int make_prot(u32 p_flags, struct arch_elf_state *arch_state,
if (p_flags & PF_X)
prot |= PROT_EXEC;
- return arch_elf_adjust_prot(prot, arch_state, has_interp, is_interp);
+ return arch_elf_adjust_prot(prot, arch_state, is_interp);
}
/* This is much more generalized than the library routine read function,
diff --git a/include/linux/elf.h b/include/linux/elf.h
index 1c45ecf29147..d8392531899d 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -101,11 +101,11 @@ extern int arch_parse_elf_property(u32 type, const void *data, size_t datasz,
#ifdef CONFIG_ARCH_HAVE_ELF_PROT
int arch_elf_adjust_prot(int prot, const struct arch_elf_state *state,
- bool has_interp, bool is_interp);
+ bool is_interp);
#else
static inline int arch_elf_adjust_prot(int prot,
const struct arch_elf_state *state,
- bool has_interp, bool is_interp)
+ bool is_interp)
{
return prot;
}
--
2.30.2
next prev parent reply other threads:[~2022-01-24 15:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-24 15:07 [PATCH v8 0/4] arm64: Enable BTI for the executable as well as the interpreter Mark Brown
2022-01-24 15:07 ` [PATCH v8 1/4] elf: Allow architectures to parse properties on the main executable Mark Brown
2022-02-04 13:00 ` Catalin Marinas
2022-01-24 15:07 ` [PATCH v8 2/4] arm64: Enable BTI for main executable as well as the interpreter Mark Brown
2022-02-04 13:11 ` Catalin Marinas
2022-01-24 15:07 ` Mark Brown [this message]
2022-02-04 14:53 ` [PATCH v8 3/4] elf: Remove has_interp property from arch_adjust_elf_prot() Catalin Marinas
2022-01-24 15:07 ` [PATCH v8 4/4] elf: Remove has_interp property from arch_parse_elf_property() Mark Brown
2022-02-04 14:54 ` Catalin Marinas
2022-02-15 18:34 ` [PATCH v8 0/4] arm64: Enable BTI for the executable as well as the interpreter Will Deacon
2022-02-16 13:34 ` Catalin Marinas
2022-02-16 16:49 ` Szabolcs Nagy
2022-02-16 17:01 ` Mark Brown
2022-02-17 8:17 ` Szabolcs Nagy
2022-02-22 14:15 ` Mark Brown
2022-02-25 13:53 ` Will Deacon
2022-02-25 15:11 ` Mark Brown
2022-02-25 15:54 ` Will Deacon
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=20220124150704.2559523-4-broonie@kernel.org \
--to=broonie@kernel.org \
--cc=Dave.Martin@arm.com \
--cc=catalin.marinas@arm.com \
--cc=hjl.tools@gmail.com \
--cc=jeremy.linton@arm.com \
--cc=libc-alpha@sourceware.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=szabolcs.nagy@arm.com \
--cc=will@kernel.org \
--cc=yu-cheng.yu@intel.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: 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).