From: Mark Brown via Libc-alpha <libc-alpha@sourceware.org>
To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>
Cc: linux-arch@vger.kernel.org, Yu-cheng Yu <yu-cheng.yu@intel.com>,
libc-alpha@sourceware.org, Szabolcs Nagy <szabolcs.nagy@arm.com>,
Jeremy Linton <jeremy.linton@arm.com>,
Mark Brown <broonie@kernel.org>,
Dave Martin <dave.martin@arm.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 4/4] elf: Remove has_interp property from arch_parse_elf_property()
Date: Mon, 12 Jul 2021 12:52:59 +0100 [thread overview]
Message-ID: <20210712115259.29547-5-broonie@kernel.org> (raw)
In-Reply-To: <20210712115259.29547-1-broonie@kernel.org>
Since all current users of arch_parse_elf_property() are able to treat the
interpreter and main executable orthogonaly the has_interp argument is now
redundant so remove it.
Signed-off-by: Mark Brown <broonie@kernel.org>
Tested-by: Jeremy Linton <jeremy.linton@arm.com>
---
arch/arm64/include/asm/elf.h | 2 +-
fs/binfmt_elf.c | 2 +-
include/linux/elf.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index 9f86dbce2680..a6e9032b951a 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -262,7 +262,7 @@ struct arch_elf_state {
static inline int arch_parse_elf_property(u32 type, const void *data,
size_t datasz, bool compat,
- bool has_interp, bool is_interp,
+ bool is_interp,
struct arch_elf_state *arch)
{
/* No known properties for AArch32 yet */
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index ae8094d42480..f0b3c24215f6 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -753,7 +753,7 @@ static int parse_elf_property(const char *data, size_t *off, size_t datasz,
ret = arch_parse_elf_property(pr->pr_type, data + o,
pr->pr_datasz, ELF_COMPAT,
- has_interp, is_interp, arch);
+ is_interp, arch);
if (ret)
return ret;
diff --git a/include/linux/elf.h b/include/linux/elf.h
index d8392531899d..cdb080d4b34a 100644
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -88,14 +88,14 @@ struct arch_elf_state;
#ifndef CONFIG_ARCH_USE_GNU_PROPERTY
static inline int arch_parse_elf_property(u32 type, const void *data,
size_t datasz, bool compat,
- bool has_interp, bool is_interp,
+ bool is_interp,
struct arch_elf_state *arch)
{
return 0;
}
#else
extern int arch_parse_elf_property(u32 type, const void *data, size_t datasz,
- bool compat, bool has_interp, bool is_interp,
+ bool compat, bool is_interp,
struct arch_elf_state *arch);
#endif
--
2.20.1
next prev parent reply other threads:[~2021-07-12 12:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-12 11:52 [PATCH v4 0/4] arm64: Enable BTI for the executable as well as the interpreter Mark Brown via Libc-alpha
2021-07-12 11:52 ` [PATCH v4 1/4] elf: Allow architectures to parse properties on the main executable Mark Brown via Libc-alpha
2021-07-19 10:04 ` Dave Martin via Libc-alpha
2021-07-12 11:52 ` [PATCH v4 2/4] arm64: Enable BTI for main executable as well as the interpreter Mark Brown via Libc-alpha
2021-07-19 10:05 ` Dave Martin via Libc-alpha
2021-07-12 11:52 ` [PATCH v4 3/4] elf: Remove has_interp property from arch_adjust_elf_prot() Mark Brown via Libc-alpha
2021-07-19 10:05 ` Dave Martin via Libc-alpha
2021-07-12 11:52 ` Mark Brown via Libc-alpha [this message]
2021-07-19 10:05 ` [PATCH v4 4/4] elf: Remove has_interp property from arch_parse_elf_property() Dave Martin via Libc-alpha
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210712115259.29547-5-broonie@kernel.org \
--to=libc-alpha@sourceware.org \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dave.martin@arm.com \
--cc=jeremy.linton@arm.com \
--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).