---

yaml --- r: 42795 b: refs/heads/master c: 59287c0 h: refs/heads/master i: 42793: 99c0069 42791: 9e6a1fc v: v3
git-mirror · Dec 7, 2006 · b44124c · b44124c
1 parent a206341
commit b44124c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b23984d0a12a4821b2e9712c71550f321eb88bb5
+refs/heads/master: 59287c0913cc9a6c75712a775f6c1c1ef418ef3b
diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c
@@ -856,7 +856,13 @@ 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.  */
-			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
+			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);
 		}
 
 		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,