Skip to content

Commit 0e6c844

Browse files
eugenispundiramit
authored andcommitted
ANDROID: Revert "arm64: move ELF_ET_DYN_BASE to 4GB / 4MB"
Part of the above change was reverted in 2406280; 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
1 parent 3214a08 commit 0e6c844

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • arch/arm64/include/asm

arch/arm64/include/asm/elf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
169169
#ifdef CONFIG_COMPAT
170170

171171
/* PIE load location for compat arm. Must match ARM ELF_ET_DYN_BASE. */
172-
#define COMPAT_ELF_ET_DYN_BASE 0x000400000UL
172+
#define COMPAT_ELF_ET_DYN_BASE (2 * TASK_SIZE_32 / 3)
173173

174174
/* AArch32 registers. */
175175
#define COMPAT_ELF_NGREG 18

0 commit comments

Comments
 (0)