p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug: consolidate warn_slowpath_fmt() usage 

Instead of having a separate helper for no printk output, just consolidate
the logic into warn_slowpath_fmt().

Link: http://lkml.kernel.org/r/20190819234111.9019-4-keescook@chromium.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@suse.de>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Drew Davenport <ddavenport@chromium.org>
Cc: Feng Tang <feng.tang@intel.com>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Petr Mladek <pmladek@suse.com>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: YueHaibing <yuehaibing@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kees Cook 2019-09-25 16:47:58 -07:00 committed by Linus Torvalds
parent 89348fc314
commit f2f84b05e0
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/asm-generic/bug.h
View File

@ -93,9 +93,8 @@ struct bug_entry {
extern __printf(4, 5) extern __printf(4, 5)
void warn_slowpath_fmt(const char *file, const int line, unsigned taint, void warn_slowpath_fmt(const char *file, const int line, unsigned taint,
const char *fmt, ...); const char *fmt, ...);
extern void warn_slowpath_null(const char *file, const int line);
#define WANT_WARN_ON_SLOWPATH #define WANT_WARN_ON_SLOWPATH
#define __WARN() warn_slowpath_null(__FILE__, __LINE__) #define __WARN() __WARN_printf(TAINT_WARN, NULL)
#define __WARN_printf(taint, arg...) \ #define __WARN_printf(taint, arg...) \
warn_slowpath_fmt(__FILE__, __LINE__, taint, arg) warn_slowpath_fmt(__FILE__, __LINE__, taint, arg)
#else #else

14
kernel/panic.c
View File

@ -605,19 +605,19 @@ void warn_slowpath_fmt(const char *file, int line, unsigned taint,
{ {
struct warn_args args; struct warn_args args;
if (!fmt) {
pr_warn(CUT_HERE);
__warn(file, line, __builtin_return_address(0), taint,
NULL, NULL);
return;
}
args.fmt = fmt; args.fmt = fmt;
va_start(args.args, fmt); va_start(args.args, fmt);
__warn(file, line, __builtin_return_address(0), taint, NULL, &args); __warn(file, line, __builtin_return_address(0), taint, NULL, &args);
va_end(args.args); va_end(args.args);
} }
EXPORT_SYMBOL(warn_slowpath_fmt); EXPORT_SYMBOL(warn_slowpath_fmt);
void warn_slowpath_null(const char *file, int line)
{
pr_warn(CUT_HERE);
__warn(file, line, __builtin_return_address(0), TAINT_WARN, NULL, NULL);
}
EXPORT_SYMBOL(warn_slowpath_null);
#else #else
void __warn_printk(const char *fmt, ...) void __warn_printk(const char *fmt, ...)
{ {