Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f80e946 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: Fix stack alignment 



Stack randomization needs to be conditional on the personality allowing it.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 91b165c0

arch/um/kernel/process_kern.c

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "linux/proc_fs.h"

#include "linux/ptrace.h"

#include "linux/random.h"

#include "linux/personality.h"

#include "asm/unistd.h"

#include "asm/mman.h"

#include "asm/segment.h"
@@ -476,7 +477,7 @@ int singlestepping(void * t) 
#ifndef arch_align_stack

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;

	return sp & ~0xf;

}