diff options
author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2006-05-01 15:16:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 21:17:45 -0400 |
commit | 275e6e1ee2bafde77e9390b27e876fa83f24cb60 (patch) | |
tree | fca0c0a7e3bdabe82bc75a0dad5c765f3b6edaf0 /arch/um/sys-i386/Makefile | |
parent | cb8aa3d29b562e4c16fdfa4ecc8170ddc55397f4 (diff) |
[PATCH] uml: fix compilation and execution with hardened GCC
To make some half-assembly stubs compile, disable various "hardened" GCC
features:
*) we can't make it build PIC code as we need %ebx to do syscalls and GCC
wants it free for PIC
*) we can't leave stack protection as the stub is moved (not relocated!) in
memory so the RIP-relative access to the canary tries reading from an
unmapped address and causes a segfault, since we move the stub of various
megabytes (the exact amount will be decided at runtime) away from the
link-time address.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/sys-i386/Makefile')
-rw-r--r-- | arch/um/sys-i386/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/um/sys-i386/Makefile b/arch/um/sys-i386/Makefile index 82121ab03bb0..3734c3eb15a4 100644 --- a/arch/um/sys-i386/Makefile +++ b/arch/um/sys-i386/Makefile | |||
@@ -13,6 +13,8 @@ USER_OBJS := bugs.o ptrace_user.o sigcontext.o fault.o stub_segv.o | |||
13 | USER_OBJS += user-offsets.s | 13 | USER_OBJS += user-offsets.s |
14 | extra-y += user-offsets.s | 14 | extra-y += user-offsets.s |
15 | 15 | ||
16 | CFLAGS_stub_segv.o := $(CFLAGS_NO_HARDENING) | ||
17 | |||
16 | extra-$(CONFIG_MODE_TT) += unmap.o | 18 | extra-$(CONFIG_MODE_TT) += unmap.o |
17 | 19 | ||
18 | include arch/um/scripts/Makefile.rules | 20 | include arch/um/scripts/Makefile.rules |