From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 14 Aug 2018 10:24:40 +0000 (+0200)
Subject: 3.18-stable patches
X-Git-Tag: v4.18.1~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70cc24448ae1152a6f21c7a8afab9e50975a65f3;p=thirdparty%2Fkernel%2Fstable-queue.git

3.18-stable patches

added patches:
	kprobes-x86-fix-p-uses-in-error-messages.patch
---

diff --git a/queue-3.18/kprobes-x86-fix-p-uses-in-error-messages.patch b/queue-3.18/kprobes-x86-fix-p-uses-in-error-messages.patch
new file mode 100644
index 00000000000..776a4ffc63f
--- /dev/null
+++ b/queue-3.18/kprobes-x86-fix-p-uses-in-error-messages.patch
@@ -0,0 +1,60 @@
+From 0ea063306eecf300fcf06d2f5917474b580f666f Mon Sep 17 00:00:00 2001
+From: Masami Hiramatsu <mhiramat@kernel.org>
+Date: Sat, 28 Apr 2018 21:37:03 +0900
+Subject: kprobes/x86: Fix %p uses in error messages
+
+From: Masami Hiramatsu <mhiramat@kernel.org>
+
+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>
+
+---
+ arch/x86/kernel/kprobes/core.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/arch/x86/kernel/kprobes/core.c
++++ b/arch/x86/kernel/kprobes/core.c
+@@ -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
+ 		 * 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:
diff --git a/queue-3.18/series b/queue-3.18/series
index d7304178c05..c9c01284993 100644
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -3,3 +3,4 @@ root-dentries-need-rcu-delayed-freeing.patch
 fix-mntput-mntput-race.patch
 fix-__legitimize_mnt-mntput-race.patch
 arm-dts-imx6sx-fix-irq-for-pcie-bridge.patch
+kprobes-x86-fix-p-uses-in-error-messages.patch