i/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: Revert "arm: move ELF_ET_DYN_BASE to 4MB"

Browse Source 
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

This reverts commit d2471b5e84f32de4e09b58f5436a4ce3ee935e32.

Signed-off-by: Evgenii Stepanov <eugenis@google.com>
This commit is contained in:
Evgenii Stepanov
2017-11-01 15:04:42 -07:00
committed by Greg Hackmann
parent 6d14481318
commit 089ea43276
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/include/asm/elf.h
+6 -2
View File
@@ -112,8 +112,12 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
#define CORE_DUMP_USE_REGSET
#define ELF_EXEC_PAGESIZE 4096
/* This is the base location for PIE (ET_DYN with INTERP) loads. */
#define ELF_ET_DYN_BASE 0x400000UL
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
use of this is to invoke "./ld.so someprog" to test out a new version of
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
/* When the program starts, a1 contains a pointer to a function to be
registered with atexit, as per the SVR4 ABI. A value of 0 means we