x86: merge process.c a bit
PATCH 1/1 x86: merge process.c a bit
Merge arch_align_stack() and arch_randomize_brk(), since they are the same.
Tested on x86_64.
Cc Ingo Molnar <[email protected]>
---
arch/x86/kernel/process.c +14 -0
@@ -8,6 +8,7 @@#include <linux/module.h> #include <linux/pm.h> #include <linux/clockchips.h> +#include <linux/random.h> #include <trace/power.h> #include <asm/system.h> #include <asm/apic.h>
@@ -613,3 +614,16 @@ static int __init idle_setup(char *str) }early_param ("idle" , idle_setup); +unsigned long arch_align_stack (unsigned long sp) +{ +if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) + sp -=get_random_int () %8192 ; +return sp & ~0xf ; +} + +unsigned long arch_randomize_brk (struct mm_struct *mm) +{ +unsigned long range_end = mm->brk +0x02000000 ; +return randomize_range (mm->brk, range_end,0 ) ? : mm->brk; +} +
arch/x86/kernel/process_32.c +0 -13
@@ -33,7 +33,6 @@#include <linux/module.h> #include <linux/kallsyms.h> #include <linux/ptrace.h> -#include <linux/random.h> #include <linux/personality.h> #include <linux/tick.h> #include <linux/percpu.h>
@@ -497,15 +496,3 @@ unsigned long get_wchan(struct task_struct *p)return 0 ; } -unsigned long arch_align_stack (unsigned long sp) -{ -if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) - sp -=get_random_int () %8192 ; -return sp & ~0xf ; -} - -unsigned long arch_randomize_brk (struct mm_struct *mm) -{ -unsigned long range_end = mm->brk +0x02000000 ; -return randomize_range (mm->brk, range_end,0 ) ? : mm->brk; -}
arch/x86/kernel/process_64.c +0 -13
@@ -32,7 +32,6 @@#include <linux/delay.h> #include <linux/module.h> #include <linux/ptrace.h> -#include <linux/random.h> #include <linux/notifier.h> #include <linux/kprobes.h> #include <linux/kdebug.h>
@@ -660,15 +659,3 @@ long sys_arch_prctl(int code, unsigned long addr)return do_arch_prctl (current, code, addr); } -unsigned long arch_align_stack (unsigned long sp) -{ -if (!(current->personality &ADDR_NO_RANDOMIZE ) && randomize_va_space) - sp -=get_random_int () %8192 ; -return sp & ~0xf ; -} - -unsigned long arch_randomize_brk (struct mm_struct *mm) -{ -unsigned long range_end = mm->brk +0x02000000 ; -return randomize_range (mm->brk, range_end,0 ) ? : mm->brk; -}
Quoted 7 lines · Amerigo Wang
Merge
arch_align_stack()andarch_randomize_brk(), since they are the same.Tested on
x86_64.Cc Ingo Molnar <[email protected]>
Oops! I forgot my Signed-off-by... sorry.
Signed-off-by WANG Cong <[email protected]>