| From 6a50610eec0375d7e99570955f5b94c43ef5f4d0 Mon Sep 17 00:00:00 2001 |
| From: Kees Cook <keescook@chromium.org> |
| Date: Wed, 25 Sep 2019 16:48:04 -0700 |
| Subject: [PATCH] bug: clean up helper macros to remove __WARN_TAINT() |
| |
| commit d4bce140b4e739bceb4e239d4842cf8f346c1e0f upstream. |
| |
| 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.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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h |
| index 598d7072602f..4b18e09094cf 100644 |
| --- a/include/asm-generic/bug.h |
| +++ b/include/asm-generic/bug.h |
| @@ -62,13 +62,11 @@ struct bug_entry { |
| #endif |
| |
| #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) ({ \ |
| int __ret_warn_on = !!(condition); \ |
| if (unlikely(__ret_warn_on)) \ |
| - __WARN_ONCE_TAINT(TAINT_WARN); \ |
| + __WARN_FLAGS(BUGFLAG_ONCE | \ |
| + BUGFLAG_TAINT(TAINT_WARN)); \ |
| unlikely(__ret_warn_on); \ |
| }) |
| #endif |
| @@ -89,7 +87,7 @@ struct bug_entry { |
| * |
| * Use the versions with printk format strings to provide better diagnostics. |
| */ |
| -#ifndef __WARN_TAINT |
| +#ifndef __WARN_FLAGS |
| extern __printf(4, 5) |
| void warn_slowpath_fmt(const char *file, const int line, unsigned taint, |
| const char *fmt, ...); |
| @@ -99,11 +97,14 @@ void warn_slowpath_fmt(const char *file, const int line, unsigned taint, |
| warn_slowpath_fmt(__FILE__, __LINE__, taint, arg) |
| #else |
| extern __printf(1, 2) void __warn_printk(const char *fmt, ...); |
| -#define __WARN() do { \ |
| - printk(KERN_WARNING CUT_HERE); __WARN_TAINT(TAINT_WARN); \ |
| -} while (0) |
| -#define __WARN_printf(taint, arg...) \ |
| - do { __warn_printk(arg); __WARN_TAINT(taint); } while (0) |
| +#define __WARN() do { \ |
| + printk(KERN_WARNING CUT_HERE); \ |
| + __WARN_FLAGS(BUGFLAG_TAINT(TAINT_WARN)); \ |
| + } while (0) |
| +#define __WARN_printf(taint, arg...) do { \ |
| + __warn_printk(arg); \ |
| + __WARN_FLAGS(BUGFLAG_TAINT(taint)); \ |
| + } while (0) |
| #endif |
| |
| /* used internally by panic.c */ |
| -- |
| 2.7.4 |
| |