From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162816AbeCAW5J (ORCPT ); Thu, 1 Mar 2018 17:57:09 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:41426 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162589AbeCAW5H (ORCPT ); Thu, 1 Mar 2018 17:57:07 -0500 X-Google-Smtp-Source: AG47ELu0cT9aZ6A4K4aCYD2LmAOMZ2pySak6IOprwVVS6WLCfB3B8qZxqTttzsF8zGg+OFTvP4jgYg== Date: Thu, 1 Mar 2018 14:57:04 -0800 From: Kees Cook To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Thomas Gleixner , Peter Zijlstra , Borislav Petkov , Richard Weinberger , Linus Torvalds Subject: [RESEND][PATCH] bug: Use %pB in BUG and stack protector failure Message-ID: <20180301225704.GA34198@beast> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The BUG and stack protector reports were still using a raw %p. This changes it to %pB for more meaningful output. Fixes: ad67b74d2469 ("printk: hash addresses printed with %p") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook --- Resending through akpm as this isn't x86-specific ... --- kernel/panic.c | 2 +- lib/bug.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/panic.c b/kernel/panic.c index 2cfef408fec9..4b794f1d8561 100644 --- 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); diff --git a/lib/bug.c b/lib/bug.c index 551e4d405307..1077366f496b 100644 --- a/lib/bug.c +++ b/lib/bug.c @@ -193,7 +193,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) 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; -- 2.7.4 -- Kees Cook Pixel Security