diff options
| author | dcashman <dcashman@google.com> | 2016-02-24 13:31:22 -0800 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-10-29 01:33:54 +0200 |
| commit | 9da422df5a52939419d4a53cb854cca1e7bfb4a0 (patch) | |
| tree | 497a8b251eb77ca8acedb54521e23cd72a52ccf4 /arch/arm | |
| parent | 4062b1eabf5f8b2c387a2a27297b109d0201373c (diff) | |
| download | kernel_samsung_tuna-9da422df5a52939419d4a53cb854cca1e7bfb4a0.zip kernel_samsung_tuna-9da422df5a52939419d4a53cb854cca1e7bfb4a0.tar.gz kernel_samsung_tuna-9da422df5a52939419d4a53cb854cca1e7bfb4a0.tar.bz2 | |
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: Iac34b63294ec120edcbf8760186667a84a5cf556
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index a26960a..4cbdc31 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c @@ -261,7 +261,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm) if ((current->flags & PF_RANDOMIZE) && !(current->personality & ADDR_NO_RANDOMIZE)) - random_factor = (get_random_int() & ((1 << mmap_rnd_bits) - 1)) << PAGE_SHIFT; + random_factor = (get_random_long() & ((1UL << mmap_rnd_bits) - 1)) << PAGE_SHIFT; if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE + random_factor; |