From f75008c5e9d9ecb57f59aef2cf8780afeff22ecd Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 6 Jan 2007 13:28:21 -0800 Subject: [PATCH] --- yaml --- r: 45328 b: refs/heads/master c: 90cb28e8f76e57751ffe14abd09c2d53a6aea7c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/binfmt_elf.c | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 57d50d1eb268..b442721e923b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0abc451a685a8d8a5b05db660b06199786981b1 +refs/heads/master: 90cb28e8f76e57751ffe14abd09c2d53a6aea7c8 diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c index d3adfd353ff9..7cb28720f90e 100644 --- a/trunk/fs/binfmt_elf.c +++ b/trunk/fs/binfmt_elf.c @@ -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 * might try to exec. This is because the brk will * follow the loader, and is not movable. */ - if (current->flags & PF_RANDOMIZE) - load_bias = randomize_range(0x10000, - ELF_ET_DYN_BASE, - 0); - else - load_bias = ELF_ET_DYN_BASE; - load_bias = ELF_PAGESTART(load_bias - vaddr); + load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); } error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,