From: Masami Hiramatsu <mhiramat@kernel.org>
To: linux-kernel@vger.kernel.org, Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
"H . Peter Anvin" <hpa@zytor.com>,
Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>,
Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>,
"David S . Miller" <davem@davemloft.net>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
mhiramat@kernel.org
Subject: [RFC PATCH tip/master 2/8] kprobes/x86: Fix the description of __copy_instruction()
Date: Sun, 26 Mar 2017 12:25:59 +0900 [thread overview]
Message-ID: <149049874967.5373.17469037610998139025.stgit@devbox> (raw)
In-Reply-To: <149049860802.5373.14864980110354664466.stgit@devbox>
Fix the description comment of __copy_instruction() function
since it has already been changed to return the length of
copied instruction.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
arch/x86/kernel/kprobes/core.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 9eae5a6..81d4dc7 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -350,11 +350,10 @@ static int is_IF_modifier(kprobe_opcode_t *insn)
}
/*
- * Copy an instruction and adjust the displacement if the instruction
- * uses the %rip-relative addressing mode.
- * If it does, Return the address of the 32-bit displacement word.
- * If not, return null.
- * Only applicable to 64-bit x86.
+ * Copy an instruction with recovering modified instruction by kprobes
+ * and adjust the displacement if the instruction uses the %rip-relative
+ * addressing mode.
+ * This returns the length of copied instruction, or 0 if it has an error.
*/
int __copy_instruction(u8 *dest, u8 *src)
{
@@ -376,6 +375,7 @@ int __copy_instruction(u8 *dest, u8 *src)
memcpy(dest, insn.kaddr, length);
#ifdef CONFIG_X86_64
+ /* Only x86_64 has RIP relative instructions */
if (insn_rip_relative(&insn)) {
s64 newdisp;
u8 *disp;
next prev parent reply other threads:[~2017-03-26 3:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-26 3:23 [RFC PATCH tip/master 0/8] kprobes/x86: Make kprobes instruction buffers read-only Masami Hiramatsu
2017-03-26 3:24 ` [RFC PATCH tip/master 1/8] kprobes/x86: Fix not to boost call far instruction Masami Hiramatsu
2017-03-26 3:25 ` Masami Hiramatsu [this message]
2017-03-26 3:27 ` [RFC PATCH tip/master 3/8] kprobes/x86: Use instruction decoder for booster Masami Hiramatsu
2017-03-26 3:28 ` [RFC PATCH tip/master 4/8] kprobes/x86: Do not modify singlestep buffer while resuming Masami Hiramatsu
2017-03-26 3:29 ` [RFC PATCH tip/master 5/8] kprobes/x86: Make boostable flag boolean Masami Hiramatsu
2017-03-26 3:30 ` [RFC PATCH tip/master 6/8] kprobes/x86: Set kprobes pages readonly Masami Hiramatsu
2017-03-26 3:31 ` [RFC PATCH tip/master 7/8] kprobes/x86: Use probe_kernel_read instead of memcpy Masami Hiramatsu
2017-03-26 3:33 ` [RFC PATCH tip/master 8/8] kprobes/x86: Consolidate insn decoder users for copying code Masami Hiramatsu
2017-03-26 22:43 ` Masami Hiramatsu
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=149049874967.5373.17469037610998139025.stgit@devbox \
--to=mhiramat@kernel.org \
--cc=ananth@linux.vnet.ibm.com \
--cc=anil.s.keshavamurthy@intel.com \
--cc=aryabinin@virtuozzo.com \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
/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