aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasami Hiramatsu <[email protected]>2017-03-29 13:58:06 +0900
committerIngo Molnar <[email protected]>2017-04-12 09:23:45 +0200
commit129d17e8e8daf50f8aff4941fb4a9cda027ab9cf (patch)
tree4fbec69fb8409406ef97337f0f4d5b5da4af358d
parentbd0b90676c30fe640e7ead919b3e38846ac88ab7 (diff)
kprobes/x86: Fix the description of __copy_instruction()
Fix the description comment of __copy_instruction() function since it has already been changed to return the length of the copied instruction. Signed-off-by: Masami Hiramatsu <[email protected]> Cc: Ananth N Mavinakayanahalli <[email protected]> Cc: Andrey Ryabinin <[email protected]> Cc: Anil S Keshavamurthy <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: David S . Miller <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Ye Xiaolong <[email protected]> Link: http://lkml.kernel.org/r/149076347582.22469.3775133607244923462.stgit@devbox Signed-off-by: Ingo Molnar <[email protected]>
-rw-r--r--arch/x86/kernel/kprobes/core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 9eae5a6c5870..81d4dc786dae 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;