aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Cooper <[email protected]>2016-10-11 13:54:02 -0700
committerLinus Torvalds <[email protected]>2016-10-11 15:06:32 -0700
commitfa5114c78c596e977af04865b697b7fcb092a0fb (patch)
treeff9131f0a1d43ec14b2be1e61e352947272b0229
parentc984cbf2e34cd622b5531f776029f7b23ff17e50 (diff)
arm64: use simpler API for random address requests
Currently, all callers to randomize_range() set the length to 0 and calculate end by adding a constant to the start address. We can simplify the API to remove a bunch of needless checks and variables. Use the new randomize_addr(start, range) call to set the requested address. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Jason Cooper <[email protected]> Acked-by: Will Deacon <[email protected]> Acked-by: Kees Cook <[email protected]> Cc: "Russell King - ARM Linux" <[email protected]> Cc: Catalin Marinas <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--arch/arm64/kernel/process.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index a4f5f766af08..27b2f1387df4 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -372,12 +372,8 @@ unsigned long arch_align_stack(unsigned long sp)
unsigned long arch_randomize_brk(struct mm_struct *mm)
{
- unsigned long range_end = mm->brk;
-
if (is_compat_task())
- range_end += 0x02000000;
+ return randomize_page(mm->brk, 0x02000000);
else
- range_end += 0x40000000;
-
- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+ return randomize_page(mm->brk, 0x40000000);
}