releases/4.18.6/kprobes-arm-fix-p-uses-in-error-messages.patch

   1 From 75b2f5f5911fe7a2fc82969b2b24dde34e8f820d Mon Sep 17 00:00:00 2001
   2 From: Masami Hiramatsu <mhiramat@kernel.org>
   3 Date: Sat, 28 Apr 2018 21:37:33 +0900
   4 Subject: kprobes/arm: Fix %p uses in error messages
   5
   6 From: Masami Hiramatsu <mhiramat@kernel.org>
   7
   8 commit 75b2f5f5911fe7a2fc82969b2b24dde34e8f820d upstream.
   9
  10 Fix %p uses in error messages by removing it and
  11 using general dumper.
  12
  13 Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
  14 Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
  15 Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
  16 Cc: Arnd Bergmann <arnd@arndb.de>
  17 Cc: David Howells <dhowells@redhat.com>
  18 Cc: David S . Miller <davem@davemloft.net>
  19 Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
  20 Cc: Jon Medhurst <tixy@linaro.org>
  21 Cc: Linus Torvalds <torvalds@linux-foundation.org>
  22 Cc: Peter Zijlstra <peterz@infradead.org>
  23 Cc: Thomas Gleixner <tglx@linutronix.de>
  24 Cc: Thomas Richter <tmricht@linux.ibm.com>
  25 Cc: Tobin C . Harding <me@tobin.cc>
  26 Cc: Will Deacon <will.deacon@arm.com>
  27 Cc: acme@kernel.org
  28 Cc: akpm@linux-foundation.org
  29 Cc: brueckner@linux.vnet.ibm.com
  30 Cc: linux-arch@vger.kernel.org
  31 Cc: rostedt@goodmis.org
  32 Cc: schwidefsky@de.ibm.com
  33 Cc: stable@vger.kernel.org
  34 Link: https://lkml.kernel.org/lkml/152491905361.9916.15300852365956231645.stgit@devbox
  35 Signed-off-by: Ingo Molnar <mingo@kernel.org>
  36 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  37
  38 ---
  39  arch/arm/probes/kprobes/core.c      |    4 ++--
  40  arch/arm/probes/kprobes/test-core.c |    1 -
  41  2 files changed, 2 insertions(+), 3 deletions(-)
  42
  43 --- a/arch/arm/probes/kprobes/core.c
  44 +++ b/arch/arm/probes/kprobes/core.c
  45 @@ -289,8 +289,8 @@ void __kprobes kprobe_handler(struct pt_
  46                                 break;
  47                         case KPROBE_REENTER:
  48                                 /* A nested probe was hit in FIQ, it is a BUG */
  49 -                               pr_warn("Unrecoverable kprobe detected at %p.\n",
  50 -                                       p->addr);
  51 +                               pr_warn("Unrecoverable kprobe detected.\n");
  52 +                               dump_kprobe(p);
  53                                 /* fall through */
  54                         default:
  55                                 /* impossible cases */
  56 --- a/arch/arm/probes/kprobes/test-core.c
  57 +++ b/arch/arm/probes/kprobes/test-core.c
  58 @@ -1461,7 +1461,6 @@ fail:
  59         print_registers(&result_regs);
  60
  61         if (mem) {
  62 -               pr_err("current_stack=%p\n", current_stack);
  63                 pr_err("expected_memory:\n");
  64                 print_memory(expected_memory, mem_size);
  65                 pr_err("result_memory:\n");