lkml.org 
[lkml]   [2018]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.15 046/146] bug: use %pB in BUG and stack protector failure
    Date
    4.15-stable review patch.  If anyone has any objections, please let me know.

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

    From: Kees Cook <keescook@chromium.org>

    commit 0862ca422b79cb5aa70823ee0f07f6b468f86070 upstream.

    The BUG and stack protector reports were still using a raw %p. This
    changes it to %pB for more meaningful output.

    Link: http://lkml.kernel.org/r/20180301225704.GA34198@beast
    Fixes: ad67b74d2469 ("printk: hash addresses printed with %p")
    Signed-off-by: Kees Cook <keescook@chromium.org>
    Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Richard Weinberger <richard.weinberger@gmail.com>,
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    kernel/panic.c | 2 +-
    lib/bug.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    --- a/kernel/panic.c
    +++ b/kernel/panic.c
    @@ -640,7 +640,7 @@ device_initcall(register_warn_debugfs);
    */
    __visible void __stack_chk_fail(void)
    {
    - panic("stack-protector: Kernel stack is corrupted in: %p\n",
    + panic("stack-protector: Kernel stack is corrupted in: %pB\n",
    __builtin_return_address(0));
    }
    EXPORT_SYMBOL(__stack_chk_fail);
    --- a/lib/bug.c
    +++ b/lib/bug.c
    @@ -191,7 +191,7 @@ enum bug_trap_type report_bug(unsigned l
    if (file)
    pr_crit("kernel BUG at %s:%u!\n", file, line);
    else
    - pr_crit("Kernel BUG at %p [verbose debug info unavailable]\n",
    + pr_crit("Kernel BUG at %pB [verbose debug info unavailable]\n",
    (void *)bugaddr);

    return BUG_TRAP_TYPE_BUG;

    \
     
     \ /
      Last update: 2018-03-13 16:31    [W:4.189 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site