diff options
| author | Helge Deller <deller@gmx.de> | 2016-04-08 18:11:33 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-04-20 09:40:58 -0400 |
| commit | 7d96d5947bb6a5704e15789140bcd572cdb14d6d (patch) | |
| tree | 9371109389258844942523ddc63c99b971390521 /arch/parisc | |
| parent | ff603cca6d4fc913ee2766cedbc5dedb73d1a469 (diff) | |
| download | linux-stable-7d96d5947bb6a5704e15789140bcd572cdb14d6d.tar.gz linux-stable-7d96d5947bb6a5704e15789140bcd572cdb14d6d.tar.bz2 linux-stable-7d96d5947bb6a5704e15789140bcd572cdb14d6d.zip | |
parisc: Avoid function pointers for kernel exception routines
[ Upstream commit e3893027a300927049efc1572f852201eb785142 ]
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
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/kernel/parisc_ksyms.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 568b2c61ea02..3cad8aadc69e 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); |