From: Borislav Petkov <bp@alien8.de>
To: Andy Lutomirski <luto@amacapital.net>,
Masami Hiramatsu <mhiramat@kernel.org>
Cc: X86 ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [RFC PATCH v0 09/19] x86/mce: Convert to insn_decode()
Date: Tue, 24 Nov 2020 11:19:42 +0100 [thread overview]
Message-ID: <20201124101952.7909-10-bp@alien8.de> (raw)
In-Reply-To: <20201124101952.7909-1-bp@alien8.de>
From: Borislav Petkov <bp@suse.de>
Simplify code, no functional changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
---
arch/x86/kernel/cpu/mce/severity.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c
index 83df991314c5..a2136ced9d73 100644
--- a/arch/x86/kernel/cpu/mce/severity.c
+++ b/arch/x86/kernel/cpu/mce/severity.c
@@ -218,15 +218,15 @@ static struct severity {
static bool is_copy_from_user(struct pt_regs *regs)
{
u8 insn_buf[MAX_INSN_SIZE];
- struct insn insn;
unsigned long addr;
+ struct insn insn;
+ int ret;
if (copy_from_kernel_nofault(insn_buf, (void *)regs->ip, MAX_INSN_SIZE))
return false;
- kernel_insn_init(&insn, insn_buf, MAX_INSN_SIZE);
- insn_get_opcode(&insn);
- if (!insn.opcode.got)
+ ret = insn_decode(&insn, insn_buf, MAX_INSN_SIZE, INSN_MODE_KERN);
+ if (ret < 0)
return false;
switch (insn.opcode.value) {
@@ -234,10 +234,6 @@ static bool is_copy_from_user(struct pt_regs *regs)
case 0x8A: case 0x8B:
/* MOVZ mem,reg */
case 0xB60F: case 0xB70F:
- insn_get_modrm(&insn);
- insn_get_sib(&insn);
- if (!insn.modrm.got || !insn.sib.got)
- return false;
addr = (unsigned long)insn_get_addr_ref(&insn, regs);
break;
/* REP MOVS */
--
2.21.0
next prev parent reply other threads:[~2020-11-24 10:21 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-24 10:19 [RFC PATCH v0 00/19] x86/insn: Add an insn_decode() API Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 01/19] x86/insn: Rename insn_decode() to insn_decode_regs() Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 02/19] x86/insn: Add @buf_len param to insn_init() kernel-doc comment Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 03/19] x86/insn: Add an insn_decode() API Borislav Petkov
2020-11-25 16:53 ` Masami Hiramatsu
2020-11-25 19:25 ` Borislav Petkov
2020-11-26 1:37 ` Masami Hiramatsu
2020-11-26 17:50 ` Borislav Petkov
2020-11-27 5:54 ` Masami Hiramatsu
2020-11-24 10:19 ` [RFC PATCH v0 04/19] x86/insn-eval: Handle return values from the decoder Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 05/19] x86/boot/compressed/sev-es: Convert to insn_decode() Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 06/19] perf/x86/intel/ds: Check insn_get_length() retval Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 07/19] perf/x86/intel/ds: Check return values of insn decoder functions Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 08/19] x86/alternative: Use insn_decode() Borislav Petkov
2020-11-24 10:19 ` Borislav Petkov [this message]
2020-11-24 10:19 ` [RFC PATCH v0 10/19] x86/kprobes: Convert to insn_decode() Borislav Petkov
2020-11-25 17:19 ` Masami Hiramatsu
2020-11-24 10:19 ` [RFC PATCH v0 11/19] x86/sev-es: " Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 12/19] x86/traps: " Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 13/19] x86/uprobes: " Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 14/19] x86/tools/insn_decoder_test: " Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 15/19] tools/objtool: " Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 16/19] x86/tools/insn_sanity: " Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 17/19] tools/perf: " Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 18/19] x86/insn: Remove kernel_insn_init() Borislav Petkov
2020-11-24 10:19 ` [RFC PATCH v0 19/19] x86/insn: Make insn_complete() static Borislav Petkov
2020-11-24 17:46 ` [RFC PATCH v0 00/19] x86/insn: Add an insn_decode() API Borislav Petkov
2020-11-25 8:03 ` Masami Hiramatsu
2020-11-27 17:45 ` Andy Lutomirski
2020-11-27 22:35 ` Borislav Petkov
2020-11-29 8:50 ` Masami Hiramatsu
2020-11-30 13:44 ` Borislav Petkov
2020-11-30 17:21 ` Masami Hiramatsu
2020-12-02 18:04 ` 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=20201124101952.7909-10-bp@alien8.de \
--to=bp@alien8.de \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@amacapital.net \
--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).