From: Jiri Slaby <jslaby@suse.cz>
To: jpoimboe@redhat.com
Cc: linux-kernel@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>
Subject: [PATCH] objtool fix bytes check
Date: Mon, 5 Dec 2016 13:41:36 +0100 [thread overview]
Message-ID: <20161205124137.343-1-jslaby@suse.cz> (raw)
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
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
next reply other threads:[~2016-12-05 12:42 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-05 12:41 Jiri Slaby [this message]
2016-12-05 12:41 ` [PATCH] objtool: fix build Jiri Slaby
2016-12-05 20:40 ` Josh Poimboeuf
2016-12-14 10:48 ` Jiri Slaby
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=20161205124137.343-1-jslaby@suse.cz \
--to=jslaby@suse.cz \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®