From e080c59bfb7cf2e0498883d352c9053e5f2bf960 Mon Sep 17 00:00:00 2001 From: Evgenii Stepanov Date: Wed, 1 Nov 2017 15:10:12 -0700 Subject: ANDROID: Revert "arm64: move ELF_ET_DYN_BASE to 4GB / 4MB" Part of the above change was reverted in 240628085effc47e86f51fc3fb37bc0e628f9a85; this change reverts the rest. This ARM mmap change breaks AddressSanitizer: Shadow memory range interleaves with an existing memory mapping. ASan cannot proceed correctly. ABORTING. Revert it until ASAN runtime library is updated to handle it. Bug: 67425063 --- 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 cd3dfa346649..f9d64ed4fd2b 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -169,7 +169,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 0x000400000UL +#define COMPAT_ELF_ET_DYN_BASE (2 * TASK_SIZE_32 / 3) /* AArch32 registers. */ #define COMPAT_ELF_NGREG 18 -- cgit v1.2.3