diff options
| author | dcashman <dcashman@google.com> | 2016-02-24 13:31:22 -0800 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-04-11 11:00:26 +0200 |
| commit | ffabe4b59ef414b92894cf5b40e4e1e59eaac011 (patch) | |
| tree | d65e021844437e09bf753357277b0a44676a3ffd /arch/x86/mm | |
| parent | 576009a09a3fbf3d86c56496f62e18219ee6507c (diff) | |
BACKPORT: FROMLIST: mm: ASLR: use get_random_long()
(cherry picked from commit https://lkml.org/lkml/2016/2/4/833)
Replace calls to get_random_int() followed by a cast to (unsigned long)
with calls to get_random_long(). Also address shifting bug which, in case
of x86 removed entropy mask for mmap_rnd_bits values > 31 bits.
Bug: 26963541
Signed-off-by: Daniel Cashman <dcashman@android.com>
Signed-off-by: Daniel Cashman <dcashman@google.com>
Change-Id: Ie577b21a0678cf4b21eae06bddd8ccb27cbe70ff
Diffstat (limited to 'arch/x86/mm')
| -rw-r--r-- | arch/x86/mm/mmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index 75f9e5d80..d4fa45822 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c @@ -75,9 +75,9 @@ static unsigned long mmap_rnd(void) */ if (current->flags & PF_RANDOMIZE) { if (mmap_is_ia32()) - rnd = get_random_int() % (1<<8); + rnd = get_random_long() % (1<<8); else - rnd = get_random_int() % (1<<28); + rnd = get_random_long() % (1<<28); } return rnd << PAGE_SHIFT; } |