arm64/mm: Remove hack in mmap randomize layout

[deliverable/linux.git] / arch / arm64 / mm / mmap.c

diff --git a/arch/arm64/mm/mmap.c b/arch/arm64/mm/mmap.c
index 1d73662f00ff60c68db5335bce754d8c8dad34de..54922d1275b8d1db8dbc05a1dfa482146366862b 100644 (file)
--- a/arch/arm64/mm/mmap.c
+++ b/arch/arm64/mm/mmap.c
@@ -47,22 +47,14 @@ static int mmap_is_legacy(void)
        return sysctl_legacy_va_layout;
 }
 
-/*
- * Since get_random_int() returns the same value within a 1 jiffy window, we
- * will almost always get the same randomisation for the stack and mmap
- * region. This will mean the relative distance between stack and mmap will be
- * the same.
- *
- * To avoid this we can shift the randomness by 1 bit.
- */
 static unsigned long mmap_rnd(void)
 {
        unsigned long rnd = 0;
 
        if (current->flags & PF_RANDOMIZE)
-               rnd = (long)get_random_int() & (STACK_RND_MASK >> 1);
+               rnd = (long)get_random_int() & STACK_RND_MASK;
 
-       return rnd << (PAGE_SHIFT + 1);
+       return rnd << PAGE_SHIFT;
 }
 
 static unsigned long mmap_base(void)