summaryrefslogtreecommitdiffstats
path: root/arch/um/os-Linux
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso2006-05-01 21:16:06 +0200
committerLinus Torvalds2006-05-02 03:17:45 +0200
commitcead61a6717a9873426b08d73a34a325e3546f5d (patch)
tree5243046032ed9f4a4c6fb240a34c39a7324c5098 /arch/um/os-Linux
parent[PATCH] uml: cleanup unprofile expression and build infrastructure (diff)
downloadkernel-qcow2-linux-cead61a6717a9873426b08d73a34a325e3546f5d.tar.gz
kernel-qcow2-linux-cead61a6717a9873426b08d73a34a325e3546f5d.tar.xz
kernel-qcow2-linux-cead61a6717a9873426b08d73a34a325e3546f5d.zip
[PATCH] uml: export symbols added by GCC hardened
GCC hardened introduces additional symbol refererences (for the canary and friends), also in modules - add weak export_symbols for them. We already tested that the weak declaration creates no problem on both GCC's providing the function definition and on GCC's which don't provide it. 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/os-Linux')
-rw-r--r--arch/um/os-Linux/user_syms.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/um/os-Linux/user_syms.c b/arch/um/os-Linux/user_syms.c
index 2598158e1f53..3f33165ada68 100644
--- a/arch/um/os-Linux/user_syms.c
+++ b/arch/um/os-Linux/user_syms.c
@@ -96,6 +96,13 @@ EXPORT_SYMBOL_PROTO(getuid);
EXPORT_SYMBOL_PROTO(fsync);
EXPORT_SYMBOL_PROTO(fdatasync);
+/* Export symbols used by GCC for the stack protector. */
+extern void __stack_smash_handler(void *) __attribute__((weak));
+EXPORT_SYMBOL(__stack_smash_handler);
+
+extern long __guard __attribute__((weak));
+EXPORT_SYMBOL(__guard);
+
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically