[tip:core/urgent] objtool: Fix bytes check of lea's rex_prefix

From	tip-bot for Jiri Slaby <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:core/urgent] objtool: Fix bytes check of lea's rex_prefix
Date	2016-12-06 11:20 +0100
Message-ID	<sLl0S-L2-29@gated-at.bofh.it> (permalink)
References	<sKZa2-3tB-21@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Commit-ID:  69042bf2001b44e81cd86ab11a4637b9d9a14c5a
Gitweb:     http://git.kernel.org/tip/69042bf2001b44e81cd86ab11a4637b9d9a14c5a
Author:     Jiri Slaby <jslaby@suse.cz>
AuthorDate: Mon, 5 Dec 2016 11:55:51 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 6 Dec 2016 09:20:59 +0100

objtool: Fix bytes check of lea's rex_prefix

For the "lea %(rsp), %rbp" case, we check if there is a rex_prefix.
But we check 'bytes' which is insn_byte_t[4] in rex_prefix (insn_field
structure). Therefore, the check is always true.

Instead, check 'nbytes' which is the right one.

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/20161205105551.25917-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 b63a31b..5e0dea2 100644
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@ -99,7 +99,7 @@ int arch_decode_instruction(struct elf *elf, struct section *sec,
 		break;
 
 	case 0x8d:
-		if (insn.rex_prefix.bytes &&
+		if (insn.rex_prefix.nbytes &&
 		    insn.rex_prefix.bytes[0] == 0x48 &&
 		    insn.modrm.nbytes && insn.modrm.bytes[0] == 0x2c &&
 		    insn.sib.nbytes && insn.sib.bytes[0] == 0x24)

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] objtool: fix bytes check of lea's rex_prefix Jiri Slaby <jslaby@suse.cz> - 2016-12-05 12:00 +0100
  Re: [PATCH] objtool: fix bytes check of lea's rex_prefix Josh Poimboeuf <jpoimboe@redhat.com> - 2016-12-05 21:30 +0100
  [tip:core/urgent] objtool: Fix bytes check of lea's rex_prefix tip-bot for Jiri Slaby <tipbot@zytor.com> - 2016-12-06 11:20 +0100

csiph-web