Skip to contentSkip to conversation

Patch "powerpc: move ELF_ET_DYN_BASE to 4GB / 4MB" has been added to the 4.12-stable tree

PATCH [email protected] 1 participant 1 message Jul 18, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

powerpc: move ELF_ET_DYN_BASE to 4GB / 4MB

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
powerpc-move-elf_et_dyn_base-to-4gb-4mb.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 47ebb09d54856500c5a5e14824781902b3bb738e Mon Sep 17 00:00:00 2001

From: Kees Cook <[email protected]>
Date: Mon, 10 Jul 2017 15:52:47 -0700
Subject: powerpc: move ELF_ET_DYN_BASE to 4GB / 4MB

From: Kees Cook <[email protected]>

commit 47ebb09d54856500c5a5e14824781902b3bb738e upstream.

Now that explicitly executed loaders are loaded in the mmap region, we have more freedom to decide where we position PIE binaries in the address space to avoid possible collisions with mmap or stack regions.

For 64-bit, align to 4GB to allow runtimes to use the entire 32-bit address space for 32-bit pointers. On 32-bit use 4MB, which is the traditional x86 minimum load location, likely to avoid historically requiring a 4MB page table entry when only a portion of the first 4MB would be used (since the NULL address is avoided).

---
 arch/powerpc/include/asm/elf.h |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
arch/powerpc/include/asm/elf.h +7 -6
@@ -23,12 +23,13 @@
 #define CORE_DUMP_USE_REGSET
 #define ELF_EXEC_PAGESIZE	PAGE_SIZE
 
-/* 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	0x20000000
+/*
+ * This is the base location for PIE (ET_DYN with INTERP) loads. On
+ * 64-bit, this is raised to 4GB to leave the entire 32-bit address
+ * space open for things that want to use the area for 32-bit pointers.
+ */
+#define ELF_ET_DYN_BASE		(is_32bit_task() ? 0x000400000UL : \
+						   0x100000000UL)
 
 #define ELF_CORE_EFLAGS (is_elf2_task() ? 2 : 0)
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/binfmt_elf-use-elf_et_dyn_base-only-for-pie.patch queue-4.12/s390-reduce-elf_et_dyn_base.patch queue-4.12/arm-move-elf_et_dyn_base-to-4mb.patch queue-4.12/arm64-move-elf_et_dyn_base-to-4gb-4mb.patch queue-4.12/powerpc-move-elf_et_dyn_base-to-4gb-4mb.patch