lkml.org 
[lkml]   [2022]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 015/130] x86/insn: Rename insn_decode() to insn_decode_from_regs()
    Date
    From: Borislav Petkov <bp@suse.de>

    commit 9e761296c52dcdb1aaa151b65bd39accb05740d9 upstream.

    Rename insn_decode() to insn_decode_from_regs() to denote that it
    receives regs as param and uses registers from there during decoding.
    Free the former name for a more generic version of the function.

    No functional changes.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20210304174237.31945-2-bp@alien8.de
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/include/asm/insn-eval.h | 4 ++--
    arch/x86/kernel/sev-es.c | 2 +-
    arch/x86/kernel/umip.c | 2 +-
    arch/x86/lib/insn-eval.c | 6 +++---
    4 files changed, 7 insertions(+), 7 deletions(-)

    --- a/arch/x86/include/asm/insn-eval.h
    +++ b/arch/x86/include/asm/insn-eval.h
    @@ -26,7 +26,7 @@ int insn_fetch_from_user(struct pt_regs
    unsigned char buf[MAX_INSN_SIZE]);
    int insn_fetch_from_user_inatomic(struct pt_regs *regs,
    unsigned char buf[MAX_INSN_SIZE]);
    -bool insn_decode(struct insn *insn, struct pt_regs *regs,
    - unsigned char buf[MAX_INSN_SIZE], int buf_size);
    +bool insn_decode_from_regs(struct insn *insn, struct pt_regs *regs,
    + unsigned char buf[MAX_INSN_SIZE], int buf_size);

    #endif /* _ASM_X86_INSN_EVAL_H */
    --- a/arch/x86/kernel/sev-es.c
    +++ b/arch/x86/kernel/sev-es.c
    @@ -236,7 +236,7 @@ static enum es_result vc_decode_insn(str
    return ES_EXCEPTION;
    }

    - if (!insn_decode(&ctxt->insn, ctxt->regs, buffer, res))
    + if (!insn_decode_from_regs(&ctxt->insn, ctxt->regs, buffer, res))
    return ES_DECODE_FAILED;
    } else {
    res = vc_fetch_insn_kernel(ctxt, buffer);
    --- a/arch/x86/kernel/umip.c
    +++ b/arch/x86/kernel/umip.c
    @@ -356,7 +356,7 @@ bool fixup_umip_exception(struct pt_regs
    if (!nr_copied)
    return false;

    - if (!insn_decode(&insn, regs, buf, nr_copied))
    + if (!insn_decode_from_regs(&insn, regs, buf, nr_copied))
    return false;

    umip_inst = identify_insn(&insn);
    --- a/arch/x86/lib/insn-eval.c
    +++ b/arch/x86/lib/insn-eval.c
    @@ -1492,7 +1492,7 @@ int insn_fetch_from_user_inatomic(struct
    }

    /**
    - * insn_decode() - Decode an instruction
    + * insn_decode_from_regs() - Decode an instruction
    * @insn: Structure to store decoded instruction
    * @regs: Structure with register values as seen when entering kernel mode
    * @buf: Buffer containing the instruction bytes
    @@ -1505,8 +1505,8 @@ int insn_fetch_from_user_inatomic(struct
    *
    * True if instruction was decoded, False otherwise.
    */
    -bool insn_decode(struct insn *insn, struct pt_regs *regs,
    - unsigned char buf[MAX_INSN_SIZE], int buf_size)
    +bool insn_decode_from_regs(struct insn *insn, struct pt_regs *regs,
    + unsigned char buf[MAX_INSN_SIZE], int buf_size)
    {
    int seg_defs;


    \
     
     \ /
      Last update: 2022-07-12 20:46    [W:4.478 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site