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@xxxxxxxxxx>
Tested-by: Jeremy Linton <jeremy.linton@xxxxxxx>
Reviewed-By: Dave Martin <Dave.Martin@xxxxxxx>
---
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 1aecb20facd5..28b1742c625a 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -703,7 +703,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 1b2d0fc87ad4..5d24aa203b61 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.20.1
