---

yaml --- r: 45328 b: refs/heads/master c: 90cb28e h: refs/heads/master v: v3
git-mirror · Jan 6, 2007 · f75008c · f75008c
1 parent cc31845
commit f75008c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git 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
@@ -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,