Commit 2a8358d8 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds
Browse files

bug: define the "cut here" string in a single place 

The "cut here" string is used in a few paths.  Define it in a single
place.

Link: http://lkml.kernel.org/r/1510100869-73751-3-git-send-email-keescook@chromium.org


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d32f11ba

arch/mn10300/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

include/asm-generic/bug.h

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,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)

kernel/panic.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,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",

lib/bug.c

+1 −1
Original line number Diff line number Diff line
@@ -186,7 +186,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE