lkml.org 
[lkml]   [2017]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.11 59/88] s390: reduce ELF_ET_DYN_BASE
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Kees Cook <keescook@chromium.org>

    commit a73dc5370e153ac63718d850bddf0c9aa9d871e6 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). For s390 the
    position could be 0x10000, but that is needlessly close to the NULL
    address.

    Link: http://lkml.kernel.org/r/1498154792-49952-5-git-send-email-keescook@chromium.org
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Cc: Russell King <linux@armlinux.org.uk>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Will Deacon <will.deacon@arm.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Michael Ellerman <mpe@ellerman.id.au>
    Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
    Cc: James Hogan <james.hogan@imgtec.com>
    Cc: Pratyush Anand <panand@redhat.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/s390/include/asm/elf.h | 15 +++++++--------
    1 file changed, 7 insertions(+), 8 deletions(-)

    --- a/arch/s390/include/asm/elf.h
    +++ b/arch/s390/include/asm/elf.h
    @@ -160,14 +160,13 @@ extern unsigned int vdso_enabled;
    #define CORE_DUMP_USE_REGSET
    #define ELF_EXEC_PAGESIZE 4096

    -/* 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. 64-bit
    - tasks are aligned to 4GB. */
    -#define ELF_ET_DYN_BASE (is_compat_task() ? \
    - (STACK_TOP / 3 * 2) : \
    - (STACK_TOP / 3 * 2) & ~((1UL << 32) - 1))
    +/*
    + * 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_compat_task() ? 0x000400000UL : \
    + 0x100000000UL)

    /* This yields a mask that user programs can use to figure out what
    instruction set this CPU supports. */

    \
     
     \ /
      Last update: 2017-07-19 12:18    [W:4.212 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site