4.14-stable review patch. If anyone has any objections, please let me know.
------------------ From: Masami Hiramatsu <mhira...@kernel.org> commit 75b2f5f5911fe7a2fc82969b2b24dde34e8f820d upstream. Fix %p uses in error messages by removing it and using general dumper. Signed-off-by: Masami Hiramatsu <mhira...@kernel.org> Cc: Ananth N Mavinakayanahalli <ana...@in.ibm.com> Cc: Anil S Keshavamurthy <anil.s.keshavamur...@intel.com> Cc: Arnd Bergmann <a...@arndb.de> Cc: David Howells <dhowe...@redhat.com> Cc: David S . Miller <da...@davemloft.net> Cc: Heiko Carstens <heiko.carst...@de.ibm.com> Cc: Jon Medhurst <t...@linaro.org> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Thomas Gleixner <t...@linutronix.de> Cc: Thomas Richter <tmri...@linux.ibm.com> Cc: Tobin C . Harding <m...@tobin.cc> Cc: Will Deacon <will.dea...@arm.com> Cc: a...@kernel.org Cc: a...@linux-foundation.org Cc: brueck...@linux.vnet.ibm.com Cc: linux-a...@vger.kernel.org Cc: rost...@goodmis.org Cc: schwidef...@de.ibm.com Cc: sta...@vger.kernel.org Link: https://lkml.kernel.org/lkml/152491905361.9916.15300852365956231645.stgit@devbox Signed-off-by: Ingo Molnar <mi...@kernel.org> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- arch/arm/probes/kprobes/core.c | 4 ++-- arch/arm/probes/kprobes/test-core.c | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) --- a/arch/arm/probes/kprobes/core.c +++ b/arch/arm/probes/kprobes/core.c @@ -291,8 +291,8 @@ void __kprobes kprobe_handler(struct pt_ break; case KPROBE_REENTER: /* A nested probe was hit in FIQ, it is a BUG */ - pr_warn("Unrecoverable kprobe detected at %p.\n", - p->addr); + pr_warn("Unrecoverable kprobe detected.\n"); + dump_kprobe(p); /* fall through */ default: /* impossible cases */ --- a/arch/arm/probes/kprobes/test-core.c +++ b/arch/arm/probes/kprobes/test-core.c @@ -1517,7 +1517,6 @@ fail: print_registers(&result_regs); if (mem) { - pr_err("current_stack=%p\n", current_stack); pr_err("expected_memory:\n"); print_memory(expected_memory, mem_size); pr_err("result_memory:\n");
