Commit d4bce140 authored by Kees Cook's avatar Kees Cook Committed by Linus Torvalds

bug: clean up helper macros to remove __WARN_TAINT()

In preparation for cleaning up "cut here" even more, this removes the
__WARN_*TAINT() helpers, as they limit the ability to add new BUGFLAG_*
flags to call sites.  They are removed by expanding them into full
__WARN_FLAGS() calls.

Link: http://lkml.kernel.org/r/20190819234111.9019-6-keescook@chromium.orgSigned-off-by: default avatarKees 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d38aba49
...@@ -62,13 +62,11 @@ struct bug_entry { ...@@ -62,13 +62,11 @@ struct bug_entry {
#endif #endif
#ifdef __WARN_FLAGS #ifdef __WARN_FLAGS
#define __WARN_TAINT(taint) __WARN_FLAGS(BUGFLAG_TAINT(taint))
#define __WARN_ONCE_TAINT(taint) __WARN_FLAGS(BUGFLAG_ONCE|BUGFLAG_TAINT(taint))
#define WARN_ON_ONCE(condition) ({ \ #define WARN_ON_ONCE(condition) ({ \
int __ret_warn_on = !!(condition); \ int __ret_warn_on = !!(condition); \
if (unlikely(__ret_warn_on)) \ if (unlikely(__ret_warn_on)) \
__WARN_ONCE_TAINT(TAINT_WARN); \ __WARN_FLAGS(BUGFLAG_ONCE | \
BUGFLAG_TAINT(TAINT_WARN)); \
unlikely(__ret_warn_on); \ unlikely(__ret_warn_on); \
}) })
#endif #endif
...@@ -89,7 +87,7 @@ struct bug_entry { ...@@ -89,7 +87,7 @@ struct bug_entry {
* *
* Use the versions with printk format strings to provide better diagnostics. * Use the versions with printk format strings to provide better diagnostics.
*/ */
#ifndef __WARN_TAINT #ifndef __WARN_FLAGS
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, ...);
...@@ -99,11 +97,14 @@ void warn_slowpath_fmt(const char *file, const int line, unsigned taint, ...@@ -99,11 +97,14 @@ void warn_slowpath_fmt(const char *file, const int line, unsigned taint,
warn_slowpath_fmt(__FILE__, __LINE__, taint, arg) warn_slowpath_fmt(__FILE__, __LINE__, taint, arg)
#else #else
extern __printf(1, 2) void __warn_printk(const char *fmt, ...); extern __printf(1, 2) void __warn_printk(const char *fmt, ...);
#define __WARN() do { \ #define __WARN() do { \
printk(KERN_WARNING CUT_HERE); __WARN_TAINT(TAINT_WARN); \ printk(KERN_WARNING CUT_HERE); \
} while (0) __WARN_FLAGS(BUGFLAG_TAINT(TAINT_WARN)); \
#define __WARN_printf(taint, arg...) \ } while (0)
do { __warn_printk(arg); __WARN_TAINT(taint); } while (0) #define __WARN_printf(taint, arg...) do { \
__warn_printk(arg); \
__WARN_FLAGS(BUGFLAG_TAINT(taint)); \
} while (0)
#endif #endif
/* used internally by panic.c */ /* used internally by panic.c */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment