From: Masami Hiramatsu <mhiramat@kernel.org>
To: Ingo Molnar <mingo@kernel.org>, Steven Rostedt <rostedt@goodmis.org>
Cc: "Naveen N . Rao" <naveen.n.rao@linux.vnet.ibm.com>,
Ananth N Mavinakayanahalli <ananth@linux.ibm.com>,
linux-kernel@vger.kernel.org, mhiramat@kernel.org,
x86@kernel.org
Subject: [BUGFIX PATCH -tip 2/2] x86/kprobes: Identify far indirect JMP correctly
Date: Thu, 25 Feb 2021 21:02:18 +0900 [thread overview]
Message-ID: <161425453835.93763.14098305070550862436.stgit@devnote2> (raw)
In-Reply-To: <161425451732.93763.18329509061375062554.stgit@devnote2>
Since Grp5 far indirect JMP is FF "mod 101 r/m", it should be
(modrm & 0x38) == 0x28, and near indirect JMP is also 0x38 == 0x20.
So we can mask modrm with 0x30 and check 0x20.
This is actually what the original code does, it also doesn't care
the last bit. So the result code is same.
Thus, I think this is just a cosmetic cleanup.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
arch/x86/kernel/kprobes/core.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 08674e7a5d7b..be76568d57a5 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -462,8 +462,7 @@ static void set_resume_flags(struct kprobe *p, struct insn *insn)
p->ainsn.is_call = 1;
p->ainsn.is_abs_ip = 1;
break;
- } else if (((opcode & 0x31) == 0x20) ||
- ((opcode & 0x31) == 0x21)) {
+ } else if ((opcode & 0x30) == 0x20) {
/*
* jmp near and far, absolute indirect
* ip is correct.
prev parent reply other threads:[~2021-02-25 12:03 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 12:01 [BUGFIX PATCH -tip 0/2] x86/kprobes: Fix bugs in resume execution code Masami Hiramatsu
2021-02-25 12:02 ` [BUGFIX PATCH -tip 1/2] x86/kprobes: Retrieve correct opcode for group instruction Masami Hiramatsu
2021-02-25 12:02 ` Masami Hiramatsu [this message]
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=161425453835.93763.14098305070550862436.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=ananth@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=naveen.n.rao@linux.vnet.ibm.com \
--cc=rostedt@goodmis.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
Powered by JetHome