From: Kees Cook <keescook@chromium.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>,
Peter Zijlstra <peterz@infradead.org>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Joe Perches <joe@perches.com>,
Fengguang Wu <fengguang.wu@intel.com>,
Arnd Bergmann <arnd@arndb.de>,
linux-am33-list@redhat.com, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org
Subject: [PATCH 2/3] bug: Define the "cut here" string in a single place
Date: Tue, 7 Nov 2017 16:27:48 -0800 [thread overview]
Message-ID: <1510100869-73751-3-git-send-email-keescook@chromium.org> (raw)
In-Reply-To: <1510100869-73751-1-git-send-email-keescook@chromium.org>
The "cut here" string is used in a few paths. Define it in a single place.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/mn10300/mm/fault.c | 2 +-
include/asm-generic/bug.h | 2 ++
kernel/panic.c | 2 +-
lib/bug.c | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c
index f23781d6bbb3..f0bfa1448744 100644
--- a/arch/mn10300/mm/fault.c
+++ b/arch/mn10300/mm/fault.c
@@ -60,7 +60,7 @@ void bust_spinlocks(int yes)
void do_BUG(const char *file, int line)
{
bust_spinlocks(1);
- printk(KERN_EMERG "------------[ cut here ]------------\n");
+ printk(KERN_EMERG CUT_HERE);
printk(KERN_EMERG "kernel BUG at %s:%d!\n", file, line);
}
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index 87191357d303..673a79dd3928 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -3,6 +3,8 @@
#include <linux/compiler.h>
+#define CUT_HERE "------------[ cut here ]------------\n"
+
#ifdef CONFIG_GENERIC_BUG
#define BUGFLAG_WARNING (1 << 0)
#define BUGFLAG_ONCE (1 << 1)
diff --git a/kernel/panic.c b/kernel/panic.c
index bdd18afa19a4..ab210714f2f3 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -518,7 +518,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
{
disable_trace_on_warning();
- pr_warn("------------[ cut here ]------------\n");
+ pr_warn(CUT_HERE);
if (file)
pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS\n",
diff --git a/lib/bug.c b/lib/bug.c
index a6a1137d06db..2c9e04621638 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -185,7 +185,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
return BUG_TRAP_TYPE_WARN;
}
- printk(KERN_DEFAULT "------------[ cut here ]------------\n");
+ printk(KERN_DEFAULT CUT_HERE);
if (file)
pr_crit("kernel BUG at %s:%u!\n", file, line);
--
2.7.4
next prev parent reply other threads:[~2017-11-08 0:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-08 0:27 [PATCH 0/3] bug: Fix "cut here" location for __WARN_TAINT Kees Cook
2017-11-08 0:27 ` [PATCH 1/3] lkdtm: Include WARN format string Kees Cook
2017-11-08 0:27 ` Kees Cook
2017-11-08 0:27 ` Kees Cook [this message]
2017-11-08 0:27 ` [PATCH 2/3] bug: Define the "cut here" string in a single place Kees Cook
2017-11-08 0:27 ` [PATCH 3/3] bug: Fix "cut here" location for __WARN_TAINT architectures Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1510100869-73751-3-git-send-email-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=fengguang.wu@intel.com \
--cc=joe@perches.com \
--cc=jpoimboe@redhat.com \
--cc=linux-am33-list@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).