Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 040c05c6 authored by Evgenii Stepanov's avatar Evgenii Stepanov Committed by Amit Pundir
Browse files

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 6a9af90a.

Signed-off-by: default avatarEvgenii Stepanov <eugenis@google.com>

[AmitP: Updated the commit ID of reverted upstream commit]
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
parent 58c1dd3a

arch/arm/include/asm/elf.h

+6 −2
Original line number Diff line number Diff line
@@ -113,8 +113,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