lkml.org 
[lkml]   [2018]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/9] x86/dumpstack: Add loglevel argument to show_opcodes()
    Date
    From: Borislav Petkov <bp@suse.de>

    Will be used in the next patch.

    Signed-off-by: Borislav Petkov <bp@suse.de>
    ---
    arch/x86/include/asm/stacktrace.h | 1 +
    arch/x86/kernel/dumpstack.c | 6 +++---
    2 files changed, 4 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
    index 133d9425fced..0630eeb18bbc 100644
    --- a/arch/x86/include/asm/stacktrace.h
    +++ b/arch/x86/include/asm/stacktrace.h
    @@ -111,4 +111,5 @@ static inline unsigned long caller_frame_pointer(void)
    return (unsigned long)frame;
    }

    +void show_opcodes(u8 *rip, const char *loglvl);
    #endif /* _ASM_X86_STACKTRACE_H */
    diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
    index 12ddfc9dcb01..3625f79fbb42 100644
    --- a/arch/x86/kernel/dumpstack.c
    +++ b/arch/x86/kernel/dumpstack.c
    @@ -73,13 +73,13 @@ static void printk_stack_address(unsigned long address, int reliable,
    printk("%s %s%pB\n", log_lvl, reliable ? "" : "? ", (void *)address);
    }

    -static void show_opcodes(u8 *rip)
    +void show_opcodes(u8 *rip, const char *loglvl)
    {
    unsigned int code_prologue = code_bytes * 43 / OPCODE_BUFSIZE;
    u8 *ip;
    int i;

    - printk(KERN_DEFAULT "Code: ");
    + printk("%sCode: ", loglvl);

    ip = (u8 *)rip - code_prologue;
    if (probe_kernel_read(opcodes, ip, code_bytes)) {
    @@ -432,6 +432,6 @@ void show_regs(struct pt_regs *regs)
    if (regs->ip < PAGE_OFFSET)
    pr_cont(" Bad RIP value.\n");
    else
    - show_opcodes((u8 *)regs->ip);
    + show_opcodes((u8 *)regs->ip, KERN_DEFAULT);
    }
    }
    --
    2.13.0
    \
     
     \ /
      Last update: 2018-03-06 10:49    [W:2.501 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site