From: Borislav Petkov <bp@alien8.de>
To: X86 ML <x86@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 17/21] tools/objtool: Convert to insn_decode()
Date: Wed, 24 Feb 2021 12:02:29 +0100 [thread overview]
Message-ID: <20210224110233.19715-18-bp@alien8.de> (raw)
In-Reply-To: <20210224110233.19715-1-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
Simplify code, no functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
tools/objtool/arch/x86/decode.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c
index cde9c36e40ae..67ee8d2a9e5c 100644
--- a/tools/objtool/arch/x86/decode.c
+++ b/tools/objtool/arch/x86/decode.c
@@ -90,7 +90,7 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec,
struct list_head *ops_list)
{
struct insn insn;
- int x86_64, sign;
+ int x86_64, sign, ret;
unsigned char op1, op2, rex = 0, rex_b = 0, rex_r = 0, rex_w = 0,
rex_x = 0, modrm = 0, modrm_mod = 0, modrm_rm = 0,
modrm_reg = 0, sib = 0;
@@ -101,10 +101,9 @@ int arch_decode_instruction(const struct elf *elf, const struct section *sec,
if (x86_64 == -1)
return -1;
- insn_init(&insn, sec->data->d_buf + offset, maxlen, x86_64);
- insn_get_length(&insn);
-
- if (!insn_complete(&insn)) {
+ ret = insn_decode(&insn, sec->data->d_buf + offset, maxlen,
+ x86_64 ? INSN_MODE_64 : INSN_MODE_32);
+ if (ret < 0) {
WARN("can't decode instruction at %s:0x%lx", sec->name, offset);
return -1;
}
--
2.29.2
next prev parent reply other threads:[~2021-02-24 11:13 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-24 11:02 [PATCH v2 00/21] x86/insn: Add an insn_decode() API Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 01/21] x86/insn: Rename insn_decode() to insn_decode_from_regs() Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 02/21] x86/insn: Add @buf_len param to insn_init() kernel-doc comment Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 03/21] x86/insn: Add a __ignore_sync_check__ marker Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 04/21] x86/insn: Add an insn_decode() API Borislav Petkov
2021-02-26 15:45 ` Masami Hiramatsu
2021-02-26 18:30 ` Borislav Petkov
2021-02-28 14:51 ` Masami Hiramatsu
2021-02-24 11:02 ` [PATCH v2 05/21] x86/insn-eval: Handle return values from the decoder Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 06/21] x86/boot/compressed/sev-es: Convert to insn_decode() Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 07/21] perf/x86/intel/ds: Check insn_get_length() retval Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 08/21] perf/x86/intel/ds: Check return values of insn decoder functions Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 09/21] x86/alternative: Use insn_decode() Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 10/21] x86/mce: Convert to insn_decode() Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 11/21] x86/kprobes: " Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 12/21] x86/sev-es: Split vc_decode_insn() Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 13/21] x86/sev-es: Convert to insn_decode() Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 14/21] x86/traps: " Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 15/21] x86/uprobes: " Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 16/21] x86/tools/insn_decoder_test: " Borislav Petkov
2021-02-24 11:02 ` Borislav Petkov [this message]
2021-02-24 11:02 ` [PATCH v2 18/21] x86/tools/insn_sanity: " Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 19/21] tools/perf: " Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 20/21] x86/insn: Remove kernel_insn_init() Borislav Petkov
2021-02-24 11:02 ` [PATCH v2 21/21] x86/insn: Make insn_complete() static Borislav Petkov
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=20210224110233.19715-18-bp@alien8.de \
--to=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).