From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751530AbcLEMmR (ORCPT ); Mon, 5 Dec 2016 07:42:17 -0500 Received: from mx2.suse.de ([195.135.220.15]:59167 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751039AbcLEMmP (ORCPT ); Mon, 5 Dec 2016 07:42:15 -0500 From: Jiri Slaby To: jpoimboe@redhat.com Cc: linux-kernel@vger.kernel.org, Jiri Slaby Subject: [PATCH] objtool fix bytes check Date: Mon, 5 Dec 2016 13:41:36 +0100 Message-Id: <20161205124137.343-1-jslaby@suse.cz> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Jiri Slaby --- Feel free to stash both of them into your objtool-dwarf branch. They are on the top of the upstream fix I have sent earlier today. tools/objtool/arch/x86/decode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c index 98eac1bb106f..ca4ede5ddd8c 100644 --- a/tools/objtool/arch/x86/decode.c +++ b/tools/objtool/arch/x86/decode.c @@ -206,7 +206,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec, break; case 0x89: - if (insn.rex_prefix.nbytes && insn.modrm.bytes && + if (insn.rex_prefix.nbytes && insn.modrm.nbytes && insn.rex_prefix.bytes[0] == 0x48 && insn.modrm.bytes[0] == 0xe5) { @@ -277,7 +277,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec, break; case 0x8d: - if (insn.rex_prefix.nbytes && insn.modrm.bytes && + if (insn.rex_prefix.nbytes && insn.modrm.nbytes && insn.rex_prefix.bytes[0] == 0x48 && insn.modrm.bytes[0] == 0x65) { @@ -291,8 +291,8 @@ int arch_decode_instruction(struct elf *elf, struct section *sec, break; } - if (insn.rex_prefix.bytes && insn.modrm.bytes && - insn.sib.bytes && insn.rex_prefix.bytes[0] == 0x4c && + if (insn.rex_prefix.nbytes && insn.modrm.nbytes && + insn.sib.nbytes && insn.rex_prefix.bytes[0] == 0x4c && insn.modrm.bytes[0] == 0x54 && insn.sib.bytes[0] == 0x24 && insn.displacement.value == 8) { @@ -312,7 +312,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec, break; } - if (drap && insn.rex_prefix.bytes && insn.modrm.bytes && + if (drap && insn.rex_prefix.nbytes && insn.modrm.nbytes && insn.rex_prefix.bytes[0] == 0x49 && insn.modrm.bytes[0] == 0x62 && insn.displacement.value == -8) { -- 2.11.0