All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Jiri Slaby <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: torvalds@linux-foundation.org, peterz@infradead.org,
	hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org,
	brgerst@gmail.com, dvlasenk@redhat.com, jslaby@suse.cz,
	bp@alien8.de, luto@kernel.org, tglx@linutronix.de,
	jpoimboe@redhat.com
Subject: [tip:core/urgent] objtool: Fix IRET's opcode
Date: Thu, 19 Jan 2017 01:10:09 -0800	[thread overview]
Message-ID: <tip-b5b46c4740aed1538544f0fa849c5b76c7823469@git.kernel.org> (raw)
In-Reply-To: <20170118132921.19319-1-jslaby@suse.cz>

Commit-ID:  b5b46c4740aed1538544f0fa849c5b76c7823469
Gitweb:     http://git.kernel.org/tip/b5b46c4740aed1538544f0fa849c5b76c7823469
Author:     Jiri Slaby <jslaby@suse.cz>
AuthorDate: Wed, 18 Jan 2017 14:29:21 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 19 Jan 2017 08:39:44 +0100

objtool: Fix IRET's opcode

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>
---
 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 5e0dea2..039636f 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;
 

      parent reply	other threads:[~2017-01-19 10:50 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-18 13:29 [PATCH] objtool: fix iret's opcode Jiri Slaby
2017-01-18 16:17 ` Josh Poimboeuf
2017-01-19  9:10 ` tip-bot for Jiri Slaby [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-b5b46c4740aed1538544f0fa849c5b76c7823469@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=bp@alien8.de \
    --cc=brgerst@gmail.com \
    --cc=dvlasenk@redhat.com \
    --cc=hpa@zytor.com \
    --cc=jpoimboe@redhat.com \
    --cc=jslaby@suse.cz \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.