READ_IMPLIES_EXEC is only used on AArch32. Just use the standard elf_read_implies_exec() macro in compat64.
Non-functional change as compat_elf_read_implies_exec is not currently considered in compat64.
Signed-off-by: Kevin Brodsky kevin.brodsky@arm.com --- arch/arm64/include/asm/elf.h | 46 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 9f5157840205..4c556ac15e04 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -102,29 +102,6 @@ #define elf_check_arch(x) ((x)->e_machine == EM_AARCH64) #endif
-/* - * An executable for which elf_read_implies_exec() returns TRUE will - * have the READ_IMPLIES_EXEC personality flag set automatically. - * - * The decision process for determining the results are: - * - * CPU*: | arm32 | arm64 | - * ELF: | | | - * ---------------------|------------|------------| - * missing PT_GNU_STACK | exec-all | exec-none | - * PT_GNU_STACK == RWX | exec-stack | exec-stack | - * PT_GNU_STACK == RW | exec-none | exec-none | - * - * exec-all : all PROT_READ user mappings are executable, except when - * backed by files on a noexec-filesystem. - * exec-none : only PROT_EXEC user mappings are executable. - * exec-stack: only the stack and PROT_EXEC user mappings are executable. - * - * *all arm64 CPUs support NX, so there is no "lacks NX" column. - * - */ -#define compat_elf_read_implies_exec(ex, stk) (stk == EXSTACK_DEFAULT) - #define CORE_DUMP_USE_REGSET #define ELF_EXEC_PAGESIZE PAGE_SIZE
@@ -294,6 +271,29 @@ extern int aarch32_setup_additional_pages(struct linux_binprm *bprm, #define compat_arch_setup_additional_pages \ aarch32_setup_additional_pages
+/* + * An executable for which elf_read_implies_exec() returns TRUE will + * have the READ_IMPLIES_EXEC personality flag set automatically. + * + * The decision process for determining the results are: + * + * CPU*: | arm32 | arm64 | + * ELF: | | | + * ---------------------|------------|------------| + * missing PT_GNU_STACK | exec-all | exec-none | + * PT_GNU_STACK == RWX | exec-stack | exec-stack | + * PT_GNU_STACK == RW | exec-none | exec-none | + * + * exec-all : all PROT_READ user mappings are executable, except when + * backed by files on a noexec-filesystem. + * exec-none : only PROT_EXEC user mappings are executable. + * exec-stack: only the stack and PROT_EXEC user mappings are executable. + * + * *all arm64 CPUs support NX, so there is no "lacks NX" column. + * + */ +#define compat_elf_read_implies_exec(ex, stk) (stk == EXSTACK_DEFAULT) + #endif /* !CONFIG_COMPAT64 */
#endif /* CONFIG_COMPAT */