From: "tip-bot2 for Borislav Petkov" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Borislav Petkov <bp@suse.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/core] x86/traps: Convert to insn_decode()
Date: Mon, 15 Mar 2021 15:47:46 -0000 [thread overview]
Message-ID: <161582326607.398.14914389363532335153.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210304174237.31945-15-bp@alien8.de>
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 0be7f42d6fcce111f487283d596594c6da6588b0
Gitweb: https://git.kernel.org/tip/0be7f42d6fcce111f487283d596594c6da6588b0
Author: Borislav Petkov <bp@suse.de>
AuthorDate: Mon, 16 Nov 2020 18:38:45 +01:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 15 Mar 2021 12:00:18 +01:00
x86/traps: Convert to insn_decode()
Simplify code, no functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210304174237.31945-15-bp@alien8.de
---
arch/x86/kernel/traps.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index ac1874a..0da8d2a 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -498,14 +498,15 @@ static enum kernel_gp_hint get_kernel_gp_address(struct pt_regs *regs,
{
u8 insn_buf[MAX_INSN_SIZE];
struct insn insn;
+ int ret;
if (copy_from_kernel_nofault(insn_buf, (void *)regs->ip,
MAX_INSN_SIZE))
return GP_NO_HINT;
- kernel_insn_init(&insn, insn_buf, MAX_INSN_SIZE);
- insn_get_modrm(&insn);
- insn_get_sib(&insn);
+ ret = insn_decode(&insn, insn_buf, MAX_INSN_SIZE, INSN_MODE_KERN);
+ if (ret < 0)
+ return GP_NO_HINT;
*addr = (unsigned long)insn_get_addr_ref(&insn, regs);
if (*addr == -1UL)
next prev parent reply other threads:[~2021-03-15 15:49 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 17:42 [PATCH v3 00/21] x86/insn: Add an insn_decode() API Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 01/21] x86/insn: Rename insn_decode() to insn_decode_from_regs() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 02/21] x86/insn: Add @buf_len param to insn_init() kernel-doc comment Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 03/21] x86/insn: Add a __ignore_sync_check__ marker Borislav Petkov
2021-03-12 3:07 ` Masami Hiramatsu
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 04/21] x86/insn: Add an insn_decode() API Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-15 16:53 ` Peter Zijlstra
2021-03-17 1:14 ` [PATCH v3 04/21] " Ian Rogers
2021-03-24 13:43 ` Arnaldo Carvalho de Melo
2021-03-24 13:54 ` Borislav Petkov
2021-03-24 18:21 ` Ian Rogers
2021-03-24 18:52 ` Arnaldo Carvalho de Melo
2021-03-04 17:42 ` [PATCH v3 05/21] x86/insn-eval: Handle return values from the decoder Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 06/21] x86/boot/compressed/sev-es: Convert to insn_decode() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 07/21] perf/x86/intel/ds: Check insn_get_length() retval Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 08/21] perf/x86/intel/ds: Check return values of insn decoder functions Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 09/21] x86/alternative: Use insn_decode() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 10/21] x86/mce: Convert to insn_decode() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 11/21] x86/kprobes: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 12/21] x86/sev-es: Split vc_decode_insn() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 13/21] x86/sev-es: Convert to insn_decode() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 14/21] x86/traps: " Borislav Petkov
2021-03-15 15:47 ` tip-bot2 for Borislav Petkov [this message]
2021-03-04 17:42 ` [PATCH v3 15/21] x86/uprobes: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 16/21] x86/tools/insn_decoder_test: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 17/21] tools/objtool: " Borislav Petkov
2021-03-04 17:49 ` Peter Zijlstra
2021-03-04 18:06 ` Borislav Petkov
2021-03-05 8:55 ` Peter Zijlstra
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 18/21] x86/tools/insn_sanity: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 19/21] tools/perf: " Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 20/21] x86/insn: Remove kernel_insn_init() Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for Borislav Petkov
2021-03-04 17:42 ` [PATCH v3 21/21] x86/insn: Make insn_complete() static Borislav Petkov
2021-03-15 15:47 ` [tip: x86/core] " tip-bot2 for 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=161582326607.398.14914389363532335153.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.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).