Commit 90cb28e8 authored Jan 06, 2007 by Linus Torvalds

Revert "[PATCH] binfmt_elf: randomize PIE binaries (2nd try)"



This reverts commit 59287c09.

Hugh Dickins reports that it causes random failures on x86 with SuSE
10.2, and points out

  "Isn't that randomization, anywhere from 0x10000 to ELF_ET_DYN_BASE,
   sure to place the ET_DYN from time to time just where the comment
   says it's trying to avoid? I assume that somehow results in the error
   reported."

(where the comment in question is the existing comment in the source
code about mmap/brk clashes).

Suggested-by: Hugh Dickins <hugh@veritas.com>
Acked-by: Marcus Meissner <meissner@suse.de>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Andi Kleen <ak@suse.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent d0abc451

fs/binfmt_elf.c

+1 −7

Original line number	Original line	Diff line number	Diff line
	@@ -854,13 +854,7 @@ static int load_elf_binary(struct linux_binprm bprm, struct pt_regs regs)
	* default mmap base, as well as whatever program they		* default mmap base, as well as whatever program they
	* might try to exec. This is because the brk will		* might try to exec. This is because the brk will
	* follow the loader, and is not movable. */		* follow the loader, and is not movable. */
	if (current->flags & PF_RANDOMIZE)		load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
	load_bias = randomize_range(0x10000,
	ELF_ET_DYN_BASE,
	0);
	else
	load_bias = ELF_ET_DYN_BASE;
	load_bias = ELF_PAGESTART(load_bias - vaddr);
	}		}

	error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,

Admin message