diff -Naur linux-2.6.11-rc3-mm1_bak/arch/um/kernel/process_kern.c linux-2.6.11-rc3-mm1/arch/um/kernel/process_kern.c
--- linux-2.6.11-rc3-mm1_bak/arch/um/kernel/process_kern.c 2005-02-04 12:09:03.000000000 -0700
+++ linux-2.6.11-rc3-mm1/arch/um/kernel/process_kern.c 2005-02-04 12:16:59.000000000 -0700
@@ -21,6 +21,7 @@
#include "linux/spinlock.h"
#include "linux/proc_fs.h"
#include "linux/ptrace.h"
+#include "linux/random.h"
#include "asm/unistd.h"
#include "asm/mman.h"
#include "asm/segment.h"
@@ -479,6 +480,14 @@
return 2;
}
+unsigned long arch_align_stack(unsigned long sp)
+{
+ if (randomize_va_space)
+ sp -= get_random_int() % 8192;
+ return sp & ~0xf;
+}
+
+
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
On Friday 04 February 2005 20:38, Frank Sorenson wrote:
> The stack randomization patches that went into 2.6.11-rc3-mm1 broke
> compilation of ARCH=um. This patch fixes compiling by adding
> arch_align_stack back in.
>
> Signed-off-by: Frank Sorenson <[email protected]>
> Acked-By: Jeff Dike <[email protected]>
I've just spotted that if the function is arch-dependent it means that for us
it will be subarch-dependant.
I've the doubt that the addition would better go under sys-i386 or some other
subarch-dependent directories (in a file compiled against kernelspace
headers, i.e. not listed in USER_OBJS in the directory it's contained
inside), and it'd be nice to add also the x86_64 version.
--
Paolo Giarrusso, aka Blaisorblade
Linux registered user n. 292729
http://www.user-mode-linux.org/~blaisorblade
[email protected] said:
> I've the doubt that the addition would better go under sys-i386 or
> some other subarch-dependent directories (in a file compiled against
> kernelspace headers, i.e. not listed in USER_OBJS in the directory
> it's contained inside), and it'd be nice to add also the x86_64
> version.
Yes, good point.
Jeff