Commit 208255c7 authored Apr 28, 2018 by Masami Hiramatsu Committed by Greg Kroah-Hartman Aug 17, 2018

kprobes/x86: Fix %p uses in error messages

commit 0ea063306eecf300fcf06d2f5917474b580f666f upstream.

Remove all %p uses in error messages in kprobes/x86.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Howells <dhowells@redhat.com>
Cc: David S . Miller <davem@davemloft.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Jon Medhurst <tixy@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Tobin C . Harding <me@tobin.cc>
Cc: Will Deacon <will.deacon@arm.com>
Cc: acme@kernel.org
Cc: akpm@linux-foundation.org
Cc: brueckner@linux.vnet.ibm.com
Cc: linux-arch@vger.kernel.org
Cc: rostedt@goodmis.org
Cc: schwidefsky@de.ibm.com
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/lkml/152491902310.9916.13355297638917767319.stgit@devbox

Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent af773a64

arch/x86/kernel/kprobes/core.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -365,7 +365,6 @@ int __copy_instruction(u8 dest, u8 src)
		newdisp = (u8 ) src + (s64) insn.displacement.value - (u8 ) dest;
		if ((s64) (s32) newdisp != newdisp) {
		pr_err("Kprobes error: new displacement does not fit into s32 (%llx)\n", newdisp);
		pr_err("\tSrc: %p, Dest: %p, old disp: %x\n", src, dest, insn.displacement.value);
		return 0;
		}
		disp = (u8 *) dest + insn_offset_displacement(&insn);
		@@ -568,8 +567,7 @@ static int reenter_kprobe(struct kprobe p, struct pt_regs regs,
		* Raise a BUG or we'll continue in an endless reentering loop
		* and eventually a stack overflow.
		*/
		printk(KERN_WARNING "Unrecoverable kprobe detected at %p.\n",
		p->addr);
		pr_err("Unrecoverable kprobe detected.\n");
		dump_kprobe(p);
		BUG();
		default: