Commit 129d17e8 authored Mar 29, 2017 by Masami Hiramatsu Committed by Ingo Molnar Apr 12, 2017

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 <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: David S . Miller <davem@davemloft.net>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ye Xiaolong <xiaolong.ye@intel.com>
Link: http://lkml.kernel.org/r/149076347582.22469.3775133607244923462.stgit@devbox

Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent bd0b9067

arch/x86/kernel/kprobes/core.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;