Commit 94109102 authored by Franck Bui-Huu's avatar Franck Bui-Huu Committed by Ralf Baechle

[MIPS] User stack pointer randomisation

Signed-off-by: default avatarFranck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c55757b2
...@@ -25,7 +25,9 @@ ...@@ -25,7 +25,9 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/completion.h> #include <linux/completion.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/random.h>
#include <asm/asm.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/cpu.h> #include <asm/cpu.h>
#include <asm/dsp.h> #include <asm/dsp.h>
...@@ -460,3 +462,15 @@ unsigned long get_wchan(struct task_struct *task) ...@@ -460,3 +462,15 @@ unsigned long get_wchan(struct task_struct *task)
out: out:
return pc; return pc;
} }
/*
* Don't forget that the stack pointer must be aligned on a 8 bytes
* boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
*/
unsigned long arch_align_stack(unsigned long sp)
{
if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
sp -= get_random_int() & ~PAGE_MASK;
return sp & ALMASK;
}
...@@ -470,6 +470,6 @@ extern int stop_a_enabled; ...@@ -470,6 +470,6 @@ extern int stop_a_enabled;
*/ */
#define __ARCH_WANT_UNLOCKED_CTXSW #define __ARCH_WANT_UNLOCKED_CTXSW
#define arch_align_stack(x) (x) extern unsigned long arch_align_stack(unsigned long sp);
#endif /* _ASM_SYSTEM_H */ #endif /* _ASM_SYSTEM_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment