lkml.org 
[lkml]   [2017]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH for v4.9 LTS 29/86] objtool: Fix IRET's opcode
    Date
    From: Jiri Slaby <jslaby@suse.cz>

    [ Upstream commit b5b46c4740aed1538544f0fa849c5b76c7823469 ]

    The IRET opcode is 0xcf according to the Intel manual and also to objdump of my
    vmlinux:

    1ea8: 48 cf iretq

    Fix the opcode in arch_decode_instruction().

    The previous value (0xc5) seems to correspond to LDS.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brian Gerst <brgerst@gmail.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Link: http://lkml.kernel.org/r/20170118132921.19319-1-jslaby@suse.cz
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    tools/objtool/arch/x86/decode.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
    index 5e0dea2cdc01..039636ffb6c8 100644
    --- a/tools/objtool/arch/x86/decode.c
    +++ b/tools/objtool/arch/x86/decode.c
    @@ -150,9 +150,9 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
    *type = INSN_RETURN;
    break;

    - case 0xc5: /* iret */
    case 0xca: /* retf */
    case 0xcb: /* retf */
    + case 0xcf: /* iret */
    *type = INSN_CONTEXT_SWITCH;
    break;

    --
    2.11.0
    \
     
     \ /
      Last update: 2017-06-18 00:40    [W:4.406 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site