lkml.org 
[lkml]   [2018]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 03/79] kprobes/x86: Fix %p uses in error messages
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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 | 5 +----
    1 file changed, 1 insertion(+), 4 deletions(-)

    --- a/arch/x86/kernel/kprobes/core.c
    +++ b/arch/x86/kernel/kprobes/core.c
    @@ -395,8 +395,6 @@ int __copy_instruction(u8 *dest, u8 *src
    - (u8 *) real;
    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, real, insn->displacement.value);
    return 0;
    }
    disp = (u8 *) dest + insn_offset_displacement(insn);
    @@ -640,8 +638,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:

    \
     
     \ /
      Last update: 2018-08-14 20:13    [W:2.549 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site