Skip to content

Commit 3214a08

Browse files
eugenispundiramit
authored andcommitted
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 d2471b5.
1 parent 0dd512a commit 3214a08

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

  • arch/arm/include/asm

arch/arm/include/asm/elf.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,12 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
112112
#define CORE_DUMP_USE_REGSET
113113
#define ELF_EXEC_PAGESIZE 4096
114114

115-
/* This is the base location for PIE (ET_DYN with INTERP) loads. */
116-
#define ELF_ET_DYN_BASE 0x400000UL
115+
/* This is the location that an ET_DYN program is loaded if exec'ed. Typical
116+
use of this is to invoke "./ld.so someprog" to test out a new version of
117+
the loader. We need to make sure that it is out of the way of the program
118+
that it will "exec", and that there is sufficient room for the brk. */
119+
120+
#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
117121

118122
/* When the program starts, a1 contains a pointer to a function to be
119123
registered with atexit, as per the SVR4 ABI. A value of 0 means we

0 commit comments

Comments
 (0)