From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753985AbdARQZU (ORCPT ); Wed, 18 Jan 2017 11:25:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36906 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752523AbdARQZS (ORCPT ); Wed, 18 Jan 2017 11:25:18 -0500 Date: Wed, 18 Jan 2017 10:17:08 -0600 From: Josh Poimboeuf To: Jiri Slaby Cc: mingo@kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] objtool: fix iret's opcode Message-ID: <20170118161708.jojbccphpfzowy54@treble> References: <20170118132921.19319-1-jslaby@suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170118132921.19319-1-jslaby@suse.cz> User-Agent: Mutt/1.6.0.1 (2016-04-01) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 18 Jan 2017 16:17:11 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jan 18, 2017 at 02:29:21PM +0100, Jiri Slaby wrote: > iret 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 > Cc: Josh Poimboeuf > Cc: Ingo Molnar Thanks! Acked-by: Josh Poimboeuf > --- > 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 > -- Josh