From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752093AbdASKug (ORCPT ); Thu, 19 Jan 2017 05:50:36 -0500 Received: from 65-50-211-136.cust.layer42.net ([65.50.211.136]:56850 "EHLO mail.zytor.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751812AbdASKub (ORCPT ); Thu, 19 Jan 2017 05:50:31 -0500 Date: Thu, 19 Jan 2017 01:10:09 -0800 From: tip-bot for Jiri Slaby Message-ID: 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 Reply-To: jpoimboe@redhat.com, luto@kernel.org, tglx@linutronix.de, bp@alien8.de, jslaby@suse.cz, dvlasenk@redhat.com, brgerst@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, peterz@infradead.org In-Reply-To: <20170118132921.19319-1-jslaby@suse.cz> References: <20170118132921.19319-1-jslaby@suse.cz> To: linux-tip-commits@vger.kernel.org Subject: [tip:core/urgent] objtool: Fix IRET's opcode Git-Commit-ID: b5b46c4740aed1538544f0fa849c5b76c7823469 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b5b46c4740aed1538544f0fa849c5b76c7823469 Gitweb: http://git.kernel.org/tip/b5b46c4740aed1538544f0fa849c5b76c7823469 Author: Jiri Slaby AuthorDate: Wed, 18 Jan 2017 14:29:21 +0100 Committer: Ingo Molnar 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 Acked-by: Josh Poimboeuf Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20170118132921.19319-1-jslaby@suse.cz Signed-off-by: Ingo Molnar --- 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;