diff options
| author | Helge Deller <deller@gmx.de> | 2016-10-16 00:02:27 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2016-12-12 22:21:21 +0100 |
| commit | 18d98a79382cbe5a7569788d5b7b18e7015506f2 (patch) | |
| tree | bf5d3b90523528747e7a5d67bc9086c288a94ad5 /arch/parisc/kernel/sys_parisc.c | |
| parent | 69973b830859bc6529a7a0468ba0d80ee5117826 (diff) | |
| download | linux-18d98a79382cbe5a7569788d5b7b18e7015506f2.tar.bz2 | |
parisc: Enable KASLR
Add missing code for userspace executable address randomization, e.g.
applications compiled with the gcc -pie option.
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc/kernel/sys_parisc.c')
| -rw-r--r-- | arch/parisc/kernel/sys_parisc.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c index 0a393a04e891..a81e177cac7b 100644 --- a/arch/parisc/kernel/sys_parisc.c +++ b/arch/parisc/kernel/sys_parisc.c @@ -225,19 +225,17 @@ static unsigned long mmap_rnd(void) { unsigned long rnd = 0; - /* - * 8 bits of randomness in 32bit mmaps, 20 address space bits - * 28 bits of randomness in 64bit mmaps, 40 address space bits - */ - if (current->flags & PF_RANDOMIZE) { - if (is_32bit_task()) - rnd = get_random_int() % (1<<8); - else - rnd = get_random_int() % (1<<28); - } + if (current->flags & PF_RANDOMIZE) + rnd = get_random_int() & MMAP_RND_MASK; + return rnd << PAGE_SHIFT; } +unsigned long arch_mmap_rnd(void) +{ + return (get_random_int() & MMAP_RND_MASK) << PAGE_SHIFT; +} + static unsigned long mmap_legacy_base(void) { return TASK_UNMAPPED_BASE + mmap_rnd(); |