Commit 8d734535 authored Nov 01, 2017 by Evgenii Stepanov Committed by Greg Hackmann Dec 11, 2017

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

Signed-off-by: Evgenii Stepanov <eugenis@google.com>
(cherry picked from commit b4ace31b)

Change-Id: I1f672dee2d4f9947003f297f5f3e41eb8c88a540

parent 25444205

arch/arm64/include/asm/elf.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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