diff options
Diffstat (limited to 'main/linux-vserver/aslr-pie.patch')
| -rw-r--r-- | main/linux-vserver/aslr-pie.patch | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/main/linux-vserver/aslr-pie.patch b/main/linux-vserver/aslr-pie.patch index 8b907e447e..61657061c8 100644 --- a/main/linux-vserver/aslr-pie.patch +++ b/main/linux-vserver/aslr-pie.patch @@ -1,39 +1,8 @@ -From a72b1fccf6c7c54c7a3ceef525b615b26b38f4a4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Tue, 1 Oct 2013 13:46:04 +0300 -Subject: [PATCH 3.4.63-vanilla] fs/binfmt_elf: fix memory map for PIE applications -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -arch/x86/include/asm/elf.h comment says: -" -ELF_ET_DYN_BASE 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. -" - -In case we have main application linked as PIE, this will cause -problems as the main program itself will go the memory location -that allows very little heap. - -This fixes the loader to detect PIE application by checking if -elf_interpreter is requested, and loads them to beginning of the -address space instead of the specially crafted place for elf -interpreter. - -Signed-off-by: Timo Teräs <timo.teras@iki.fi> ---- - fs/binfmt_elf.c | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c -index a009b9e..b3723a2 100644 +index 3aac8e9..4711413 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c -@@ -790,20 +790,19 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs) +@@ -804,21 +804,19 @@ static int load_elf_binary(struct linux_binprm *bprm) * default mmap base, as well as whatever program they * might try to exec. This is because the brk will * follow the loader, and is not movable. */ @@ -43,12 +12,11 @@ index a009b9e..b3723a2 100644 + load_bias = ELF_ET_DYN_BASE; #ifdef CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE /* Memory randomization might have been switched off -- * in runtime via sysctl. + * in runtime via sysctl or explicit setting of + * personality flags. - * If that is the case, retain the original non-zero - * load_bias value in order to establish proper - * non-randomized mappings. -+ * in runtime via sysctl or explicit setting of -+ * ersonality flags. */ if (current->flags & PF_RANDOMIZE) - load_bias = 0; @@ -56,13 +24,9 @@ index a009b9e..b3723a2 100644 - load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); -#else - load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); -+ load_bias += (get_random_int() & STACK_RND_MASK) << PAGE_SHIFT; ++ load_bias = (get_random_int() & STACK_RND_MASK) << PAGE_SHIFT; #endif -+ load_bias = ELF_PAGESTART(vaddr + load_bias); ++ load_bias = ELF_PAGESTART(load_bias - vaddr); } error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, --- -1.8.4 - - |