lkml.org 
[lkml]   [2018]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 5/7] kprobes/x86: Fix %p uses in error messages
    Date
    Fix %p uses in error messages in kprobes/x86.
    - Some %p uses are not needed. Just remove it (or remove message).
    - One %p use seems important to show some address
    so replaced with %pS.

    Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
    ---
    Changes in v3:
    - Do not use %px.
    ---
    arch/x86/kernel/kprobes/core.c | 12 ++++--------
    1 file changed, 4 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
    index 0715f827607c..d2c9d5c8e4ce 100644
    --- a/arch/x86/kernel/kprobes/core.c
    +++ b/arch/x86/kernel/kprobes/core.c
    @@ -391,8 +391,6 @@ int __copy_instruction(u8 *dest, u8 *src, u8 *real, struct insn *insn)
    - (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);
    @@ -636,8 +634,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:
    @@ -1146,12 +1143,11 @@ int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
    (addr < (u8 *) jprobe_return_end)) {
    if (stack_addr(regs) != saved_sp) {
    struct pt_regs *saved_regs = &kcb->jprobe_saved_regs;
    - printk(KERN_ERR
    - "current sp %p does not match saved sp %p\n",
    + pr_err("current sp %pS does not match saved sp %pS\n",
    stack_addr(regs), saved_sp);
    - printk(KERN_ERR "Saved registers for jprobe %p\n", jp);
    + pr_err("Saved registers for jprobe\n");
    show_regs(saved_regs);
    - printk(KERN_ERR "Current registers\n");
    + pr_err("Current registers\n");
    show_regs(regs);
    BUG();
    }
    \
     
     \ /
      Last update: 2018-04-27 08:43    [W:4.146 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site