lkml.org 
[lkml]   [2016]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 40/78] parisc: Avoid function pointers for kernel exception routines
    Date
    From: Helge Deller <deller@gmx.de>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit e3893027a300927049efc1572f852201eb785142 upstream.

    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>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    arch/parisc/kernel/parisc_ksyms.c | 10 +++++-----
    1 file 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);
    --
    2.8.1
    \
     
     \ /
      Last update: 2016-04-22 13:41    [W:4.128 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site