lkml.org 
[lkml]   [2021]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/core] x86: Add insn_decode_kernel()
    The following commit has been merged into the x86/core branch of tip:

    Commit-ID: 52fa82c21f64e900a72437269a5cc9e0034b424e
    Gitweb: https://git.kernel.org/tip/52fa82c21f64e900a72437269a5cc9e0034b424e
    Author: Peter Zijlstra <peterz@infradead.org>
    AuthorDate: Fri, 26 Mar 2021 16:12:00 +01:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Wed, 31 Mar 2021 16:20:22 +02:00

    x86: Add insn_decode_kernel()

    Add a helper to decode kernel instructions; there's no point in
    endlessly repeating those last two arguments.

    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20210326151259.379242587@infradead.org
    ---
    arch/x86/include/asm/insn.h | 2 ++
    arch/x86/kernel/alternative.c | 2 +-
    arch/x86/kernel/cpu/mce/severity.c | 2 +-
    arch/x86/kernel/kprobes/core.c | 4 ++--
    arch/x86/kernel/kprobes/opt.c | 2 +-
    arch/x86/kernel/traps.c | 2 +-
    tools/arch/x86/include/asm/insn.h | 2 ++
    7 files changed, 10 insertions(+), 6 deletions(-)

    diff --git a/arch/x86/include/asm/insn.h b/arch/x86/include/asm/insn.h
    index f03b6ca..05a6ab9 100644
    --- a/arch/x86/include/asm/insn.h
    +++ b/arch/x86/include/asm/insn.h
    @@ -150,6 +150,8 @@ enum insn_mode {

    extern int insn_decode(struct insn *insn, const void *kaddr, int buf_len, enum insn_mode m);

    +#define insn_decode_kernel(_insn, _ptr) insn_decode((_insn), (_ptr), MAX_INSN_SIZE, INSN_MODE_KERN)
    +
    /* Attribute will be determined after getting ModRM (for opcode groups) */
    static inline void insn_get_attribute(struct insn *insn)
    {
    diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
    index ce28c5c..ff359b3 100644
    --- a/arch/x86/kernel/alternative.c
    +++ b/arch/x86/kernel/alternative.c
    @@ -1280,7 +1280,7 @@ static void text_poke_loc_init(struct text_poke_loc *tp, void *addr,
    if (!emulate)
    emulate = opcode;

    - ret = insn_decode(&insn, emulate, MAX_INSN_SIZE, INSN_MODE_KERN);
    + ret = insn_decode_kernel(&insn, emulate);

    BUG_ON(ret < 0);
    BUG_ON(len != insn.length);
    diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c
    index a2136ce..abdd2e4 100644
    --- a/arch/x86/kernel/cpu/mce/severity.c
    +++ b/arch/x86/kernel/cpu/mce/severity.c
    @@ -225,7 +225,7 @@ static bool is_copy_from_user(struct pt_regs *regs)
    if (copy_from_kernel_nofault(insn_buf, (void *)regs->ip, MAX_INSN_SIZE))
    return false;

    - ret = insn_decode(&insn, insn_buf, MAX_INSN_SIZE, INSN_MODE_KERN);
    + ret = insn_decode_kernel(&insn, insn_buf);
    if (ret < 0)
    return false;

    diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
    index dd09021..1319ff4 100644
    --- a/arch/x86/kernel/kprobes/core.c
    +++ b/arch/x86/kernel/kprobes/core.c
    @@ -285,7 +285,7 @@ static int can_probe(unsigned long paddr)
    if (!__addr)
    return 0;

    - ret = insn_decode(&insn, (void *)__addr, MAX_INSN_SIZE, INSN_MODE_KERN);
    + ret = insn_decode_kernel(&insn, (void *)__addr);
    if (ret < 0)
    return 0;

    @@ -322,7 +322,7 @@ int __copy_instruction(u8 *dest, u8 *src, u8 *real, struct insn *insn)
    MAX_INSN_SIZE))
    return 0;

    - ret = insn_decode(insn, dest, MAX_INSN_SIZE, INSN_MODE_KERN);
    + ret = insn_decode_kernel(insn, dest);
    if (ret < 0)
    return 0;

    diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
    index 4299fc8..71425eb 100644
    --- a/arch/x86/kernel/kprobes/opt.c
    +++ b/arch/x86/kernel/kprobes/opt.c
    @@ -324,7 +324,7 @@ static int can_optimize(unsigned long paddr)
    if (!recovered_insn)
    return 0;

    - ret = insn_decode(&insn, (void *)recovered_insn, MAX_INSN_SIZE, INSN_MODE_KERN);
    + ret = insn_decode_kernel(&insn, (void *)recovered_insn);
    if (ret < 0)
    return 0;

    diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
    index a5d2540..034f27f 100644
    --- a/arch/x86/kernel/traps.c
    +++ b/arch/x86/kernel/traps.c
    @@ -504,7 +504,7 @@ static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs,
    MAX_INSN_SIZE))
    return GP_NO_HINT;

    - ret = insn_decode(&insn, insn_buf, MAX_INSN_SIZE, INSN_MODE_KERN);
    + ret = insn_decode_kernel(&insn, insn_buf);
    if (ret < 0)
    return GP_NO_HINT;

    diff --git a/tools/arch/x86/include/asm/insn.h b/tools/arch/x86/include/asm/insn.h
    index c9f3eee..dc632b4 100644
    --- a/tools/arch/x86/include/asm/insn.h
    +++ b/tools/arch/x86/include/asm/insn.h
    @@ -150,6 +150,8 @@ enum insn_mode {

    extern int insn_decode(struct insn *insn, const void *kaddr, int buf_len, enum insn_mode m);

    +#define insn_decode_kernel(_insn, _ptr) insn_decode((_insn), (_ptr), MAX_INSN_SIZE, INSN_MODE_KERN)
    +
    /* Attribute will be determined after getting ModRM (for opcode groups) */
    static inline void insn_get_attribute(struct insn *insn)
    {
    \
     
     \ /
      Last update: 2021-04-01 20:12    [W:4.169 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site