summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2016-04-08 18:11:33 +0200
committerHelge Deller <deller@gmx.de>2016-04-08 22:13:45 +0200
commite3893027a300927049efc1572f852201eb785142 (patch)
tree19d418fb5ae91ca89da29261c6a6aaf10cfb74d6
parent592570c950fb455226cd255603de7cede2be83e6 (diff)
downloadop-kernel-dev-e3893027a300927049efc1572f852201eb785142.zip
op-kernel-dev-e3893027a300927049efc1572f852201eb785142.tar.gz
parisc: Avoid function pointers for kernel exception routines
We want to avoid the kernel module loader to create function pointers for the kernel fixup routines of get_user() and put_user(). Changing the external reference from function type to int type fixes this. This unbreaks exception handling for get_user() and put_user() when called from a kernel module. Signed-off-by: Helge Deller <deller@gmx.de> Cc: stable@vger.kernel.org
-rw-r--r--arch/parisc/kernel/parisc_ksyms.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c
index 568b2c6..3cad8aa 100644
--- a/arch/parisc/kernel/parisc_ksyms.c
+++ b/arch/parisc/kernel/parisc_ksyms.c
@@ -47,11 +47,11 @@ EXPORT_SYMBOL(__cmpxchg_u64);
EXPORT_SYMBOL(lclear_user);
EXPORT_SYMBOL(lstrnlen_user);
-/* Global fixups */
-extern void fixup_get_user_skip_1(void);
-extern void fixup_get_user_skip_2(void);
-extern void fixup_put_user_skip_1(void);
-extern void fixup_put_user_skip_2(void);
+/* Global fixups - defined as int to avoid creation of function pointers */
+extern int fixup_get_user_skip_1;
+extern int fixup_get_user_skip_2;
+extern int fixup_put_user_skip_1;
+extern int fixup_put_user_skip_2;
EXPORT_SYMBOL(fixup_get_user_skip_1);
EXPORT_SYMBOL(fixup_get_user_skip_2);
EXPORT_SYMBOL(fixup_put_user_skip_1);
OpenPOWER on IntegriCloud