The patch titled
uml: Fix stack alignment
has been added to the -mm tree. Its filename is
uml-fix-stack-alignment.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: uml: Fix stack alignment
From: Jeff Dike <jdike@xxxxxxxxxxx>
Stack randomization needs to be conditional on the personality allowing it.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/kernel/process_kern.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff -puN arch/um/kernel/process_kern.c~uml-fix-stack-alignment arch/um/kernel/process_kern.c
--- a/arch/um/kernel/process_kern.c~uml-fix-stack-alignment
+++ a/arch/um/kernel/process_kern.c
@@ -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;
}
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
reduce-max_nr_zones-make-zone_highmem-optional-fix-fix-fix.patch
fix-x86_64-mm-i386-semaphore-to-asm-uml-fix.patch
uml-use-klibc-setjmp-longjmp.patch
uml-use-array_size-more-assiduously.patch
uml-fix-stack-alignment.patch
uml-whitespace-fixes.patch
uml-fix-handling-of-failed-execs-of-helpers.patch
uml-improve-sigbus-diagnostics.patch
uml-remove-pte_mkexec.patch
vdso-hash-style-fix.patch
vdso-hash-style-fix-fix.patch
namespaces-utsname-switch-to-using-uts-namespaces-uml-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
