lkml.org 
[lkml]   [2019]   [Apr]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 13/23] x86/alternative: Remove the return value of text_poke_*()
    Date
    The return value of text_poke_early() and text_poke_bp() is useless.
    Remove it.

    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Kees Cook <keescook@chromium.org>
    Cc: Dave Hansen <dave.hansen@intel.com>
    Cc: Masami Hiramatsu <mhiramat@kernel.org>
    Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Signed-off-by: Nadav Amit <namit@vmware.com>
    Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
    ---
    arch/x86/include/asm/text-patching.h | 4 ++--
    arch/x86/kernel/alternative.c | 11 ++++-------
    2 files changed, 6 insertions(+), 9 deletions(-)

    diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h
    index a75eed841eed..c90678fd391a 100644
    --- a/arch/x86/include/asm/text-patching.h
    +++ b/arch/x86/include/asm/text-patching.h
    @@ -18,7 +18,7 @@ static inline void apply_paravirt(struct paravirt_patch_site *start,
    #define __parainstructions_end NULL
    #endif

    -extern void *text_poke_early(void *addr, const void *opcode, size_t len);
    +extern void text_poke_early(void *addr, const void *opcode, size_t len);

    /*
    * Clear and restore the kernel write-protection flag on the local CPU.
    @@ -37,7 +37,7 @@ extern void *text_poke_early(void *addr, const void *opcode, size_t len);
    extern void *text_poke(void *addr, const void *opcode, size_t len);
    extern void *text_poke_kgdb(void *addr, const void *opcode, size_t len);
    extern int poke_int3_handler(struct pt_regs *regs);
    -extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler);
    +extern void text_poke_bp(void *addr, const void *opcode, size_t len, void *handler);
    extern int after_bootmem;
    extern __ro_after_init struct mm_struct *poking_mm;
    extern __ro_after_init unsigned long poking_addr;
    diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
    index 3d2b6b6fb20c..18f959975ea0 100644
    --- a/arch/x86/kernel/alternative.c
    +++ b/arch/x86/kernel/alternative.c
    @@ -265,7 +265,7 @@ static void __init_or_module add_nops(void *insns, unsigned int len)

    extern struct alt_instr __alt_instructions[], __alt_instructions_end[];
    extern s32 __smp_locks[], __smp_locks_end[];
    -void *text_poke_early(void *addr, const void *opcode, size_t len);
    +void text_poke_early(void *addr, const void *opcode, size_t len);

    /*
    * Are we looking at a near JMP with a 1 or 4-byte displacement.
    @@ -667,8 +667,8 @@ void __init alternative_instructions(void)
    * instructions. And on the local CPU you need to be protected again NMI or MCE
    * handlers seeing an inconsistent instruction while you patch.
    */
    -void *__init_or_module text_poke_early(void *addr, const void *opcode,
    - size_t len)
    +void __init_or_module text_poke_early(void *addr, const void *opcode,
    + size_t len)
    {
    unsigned long flags;

    @@ -691,7 +691,6 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
    * that causes hangs on some VIA CPUs.
    */
    }
    - return addr;
    }

    __ro_after_init struct mm_struct *poking_mm;
    @@ -893,7 +892,7 @@ NOKPROBE_SYMBOL(poke_int3_handler);
    * replacing opcode
    * - sync cores
    */
    -void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
    +void text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
    {
    unsigned char int3 = 0xcc;

    @@ -935,7 +934,5 @@ void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
    * the writing of the new instruction.
    */
    bp_patching_in_progress = false;
    -
    - return addr;
    }

    --
    2.17.1
    \
     
     \ /
      Last update: 2019-04-26 09:32    [W:2.236 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site