From 4ed22187defde44f5c49a4e09e478867c84892e5 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Wed, 24 Oct 2018 13:37:42 -0700 Subject: [PATCH] Revert "ANDROID: Revert "arm64: move ELF_ET_DYN_BASE to 4GB / 4MB"" This reverts commit 031af365d5498e5d108463dabfe7f4bbf3814497. ASan can handle the new memory layout in Android P and later, which means this change can be reverted in 4.14. Bug: 67425063 Signed-off-by: Evgenii Stepanov Change-Id: I1b09210c521ce65bbdc1e9cdaca2b5e66e097789 --- arch/arm64/include/asm/elf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index 36d9863cb3cb..33be513ef24c 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -173,7 +173,7 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, #ifdef CONFIG_COMPAT /* PIE load location for compat arm. Must match ARM ELF_ET_DYN_BASE. */ -#define COMPAT_ELF_ET_DYN_BASE (2 * TASK_SIZE_32 / 3) +#define COMPAT_ELF_ET_DYN_BASE 0x000400000UL /* AArch32 registers. */ #define COMPAT_ELF_NGREG 18 -- 2.20.1