diff options
| author | Evgenii Stepanov <eugenis@google.com> | 2017-11-01 15:04:42 -0700 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2017-11-20 21:15:59 +0530 |
| commit | 3214a08a22cc3817cdf4a7eaa519eedb2ce87666 (patch) | |
| tree | c58eb87613eb6ec2cc4a7c2dc1e14e9cc5508f62 /arch/arm/include | |
| parent | 0dd512ae00289611b3b8c286c4967010b2bb3fb5 (diff) | |
ANDROID: Revert "arm: move ELF_ET_DYN_BASE to 4MB"
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.
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/elf.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h index f13ae153fb24..d2315ffd8f12 100644 --- a/arch/arm/include/asm/elf.h +++ b/arch/arm/include/asm/elf.h @@ -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 |