---

yaml --- r: 201503 b: refs/heads/master c: cc92c28 h: refs/heads/master i: 201501: ca39bd2 201499: 98565ad 201495: 3037631 201487: 27b2dbb 201471: a90e296 v: v3
git-mirror · Jun 15, 2010 · 4eb3dad · 4eb3dad
1 parent e1399bf
commit 4eb3dad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 990cb8acf23cab19a2930f1ed5e7dc108f89079b
+refs/heads/master: cc92c28b2db5b406657ecc05235d4ca4e222ae34
diff --git a/trunk/arch/arm/mm/mmap.c b/trunk/arch/arm/mm/mmap.c
@@ -7,6 +7,7 @@
 #include <linux/shm.h>
 #include <linux/sched.h>
 #include <linux/io.h>
+#include <linux/random.h>
 #include <asm/cputype.h>
 #include <asm/system.h>
 
@@ -80,6 +81,9 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
 	        start_addr = addr = TASK_UNMAPPED_BASE;
 	        mm->cached_hole_size = 0;
 	}
+	/* 8 bits of randomness in 20 address space bits */
+	if (current->flags & PF_RANDOMIZE)
+		addr += (get_random_int() % (1 << 8)) << PAGE_SHIFT;
 
 full_search:
 	if (do_align)