提交 8f80e946 编写于 作者: J Jeff Dike 提交者: Linus Torvalds

[PATCH] uml: Fix stack alignment

Stack randomization needs to be conditional on the personality allowing it.
Signed-off-by: NJeff Dike <jdike@addtoit.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 91b165c0
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include "linux/proc_fs.h" #include "linux/proc_fs.h"
#include "linux/ptrace.h" #include "linux/ptrace.h"
#include "linux/random.h" #include "linux/random.h"
#include "linux/personality.h"
#include "asm/unistd.h" #include "asm/unistd.h"
#include "asm/mman.h" #include "asm/mman.h"
#include "asm/segment.h" #include "asm/segment.h"
...@@ -476,7 +477,7 @@ int singlestepping(void * t) ...@@ -476,7 +477,7 @@ int singlestepping(void * t)
#ifndef arch_align_stack #ifndef arch_align_stack
unsigned long arch_align_stack(unsigned long sp) unsigned long arch_align_stack(unsigned long sp)
{ {
if (randomize_va_space) if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
sp -= get_random_int() % 8192; sp -= get_random_int() % 8192;
return sp & ~0xf; return sp & ~0xf;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册