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

    Commit-ID: 1580f488ea8c6a62d002be364248c34c2f2e430b
    Gitweb: https://git.kernel.org/tip/1580f488ea8c6a62d002be364248c34c2f2e430b
    Author: Borislav Petkov <bp@suse.de>
    AuthorDate: Fri, 06 Nov 2020 19:39:08 +01:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Mon, 15 Mar 2021 11:26:40 +01:00

    x86/mce: Convert to insn_decode()

    Simplify code, no functional changes.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20210304174237.31945-11-bp@alien8.de
    ---
    arch/x86/kernel/cpu/mce/severity.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c
    index 83df991..a2136ce 100644
    --- a/arch/x86/kernel/cpu/mce/severity.c
    +++ b/arch/x86/kernel/cpu/mce/severity.c
    @@ -218,15 +218,15 @@ static struct severity {
    static bool is_copy_from_user(struct pt_regs *regs)
    {
    u8 insn_buf[MAX_INSN_SIZE];
    - struct insn insn;
    unsigned long addr;
    + struct insn insn;
    + int ret;

    if (copy_from_kernel_nofault(insn_buf, (void *)regs->ip, MAX_INSN_SIZE))
    return false;

    - kernel_insn_init(&insn, insn_buf, MAX_INSN_SIZE);
    - insn_get_opcode(&insn);
    - if (!insn.opcode.got)
    + ret = insn_decode(&insn, insn_buf, MAX_INSN_SIZE, INSN_MODE_KERN);
    + if (ret < 0)
    return false;

    switch (insn.opcode.value) {
    @@ -234,10 +234,6 @@ static bool is_copy_from_user(struct pt_regs *regs)
    case 0x8A: case 0x8B:
    /* MOVZ mem,reg */
    case 0xB60F: case 0xB70F:
    - insn_get_modrm(&insn);
    - insn_get_sib(&insn);
    - if (!insn.modrm.got || !insn.sib.got)
    - return false;
    addr = (unsigned long)insn_get_addr_ref(&insn, regs);
    break;
    /* REP MOVS */
    \
     
     \ /
      Last update: 2021-03-15 17:09    [W:4.570 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site