From: Kees Cook <keescook@chromium.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Kees Cook <keescook@chromium.org>,
Christophe Leroy <christophe.leroy@c-s.fr>,
Drew Davenport <ddavenport@chromium.org>,
Peter Zijlstra <peterz@infradead.org>,
Arnd Bergmann <arnd@arndb.de>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>,
Feng Tang <feng.tang@intel.com>, Petr Mladek <pmladek@suse.com>,
Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
Borislav Petkov <bp@suse.de>, YueHaibing <yuehaibing@huawei.com>,
linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/7] bug: Refactor away warn_slowpath_fmt_taint()
Date: Mon, 19 Aug 2019 16:41:05 -0700 [thread overview]
Message-ID: <20190819234111.9019-2-keescook@chromium.org> (raw)
In-Reply-To: <20190819234111.9019-1-keescook@chromium.org>
There's no reason to have specialized helpers for passing the warn
taint down to __warn(). Consolidate and refactor helper macros, removing
__WARN_printf() and warn_slowpath_fmt_taint().
Signed-off-by: Kees Cook <keescook@chromium.org>
---
include/asm-generic/bug.h | 13 ++++---------
kernel/panic.c | 18 +++---------------
2 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
index aa6c093d9ce9..ce466432ac3e 100644
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
@@ -90,24 +90,19 @@ struct bug_entry {
* Use the versions with printk format strings to provide better diagnostics.
*/
#ifndef __WARN_TAINT
-extern __printf(3, 4)
-void warn_slowpath_fmt(const char *file, const int line,
- const char *fmt, ...);
extern __printf(4, 5)
-void warn_slowpath_fmt_taint(const char *file, const int line, unsigned taint,
- const char *fmt, ...);
+void warn_slowpath_fmt(const char *file, const int line, unsigned taint,
+ const char *fmt, ...);
extern void warn_slowpath_null(const char *file, const int line);
#define WANT_WARN_ON_SLOWPATH
#define __WARN() warn_slowpath_null(__FILE__, __LINE__)
-#define __WARN_printf(arg...) warn_slowpath_fmt(__FILE__, __LINE__, arg)
#define __WARN_printf_taint(taint, arg...) \
- warn_slowpath_fmt_taint(__FILE__, __LINE__, taint, arg)
+ 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(arg...) __WARN_printf_taint(TAINT_WARN, arg)
#define __WARN_printf_taint(taint, arg...) \
do { __warn_printk(arg); __WARN_TAINT(taint); } while (0)
#endif
@@ -132,7 +127,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
#define WARN(condition, format...) ({ \
int __ret_warn_on = !!(condition); \
if (unlikely(__ret_warn_on)) \
- __WARN_printf(format); \
+ __WARN_printf_taint(TAINT_WARN, format); \
unlikely(__ret_warn_on); \
})
#endif
diff --git a/kernel/panic.c b/kernel/panic.c
index 057540b6eee9..4d8b7577c82c 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -592,20 +592,8 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
}
#ifdef WANT_WARN_ON_SLOWPATH
-void warn_slowpath_fmt(const char *file, int line, const char *fmt, ...)
-{
- struct warn_args args;
-
- args.fmt = fmt;
- va_start(args.args, fmt);
- __warn(file, line, __builtin_return_address(0), TAINT_WARN, NULL,
- &args);
- va_end(args.args);
-}
-EXPORT_SYMBOL(warn_slowpath_fmt);
-
-void warn_slowpath_fmt_taint(const char *file, int line,
- unsigned taint, const char *fmt, ...)
+void warn_slowpath_fmt(const char *file, int line, unsigned taint,
+ const char *fmt, ...)
{
struct warn_args args;
@@ -614,7 +602,7 @@ void warn_slowpath_fmt_taint(const char *file, int line,
__warn(file, line, __builtin_return_address(0), taint, NULL, &args);
va_end(args.args);
}
-EXPORT_SYMBOL(warn_slowpath_fmt_taint);
+EXPORT_SYMBOL(warn_slowpath_fmt);
void warn_slowpath_null(const char *file, int line)
{
--
2.17.1
next prev parent reply other threads:[~2019-08-19 23:41 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 23:41 [PATCH 0/7] Clean up WARN() "cut here" handling Kees Cook
2019-08-19 23:41 ` Kees Cook [this message]
2019-08-19 23:41 ` [PATCH 2/7] bug: Rename __WARN_printf_taint() to __WARN_printf() Kees Cook
2019-08-19 23:41 ` [PATCH 3/7] bug: Consolidate warn_slowpath_fmt() usage Kees Cook
2019-08-19 23:41 ` [PATCH 4/7] bug: Lift "cut here" out of __warn() Kees Cook
2019-08-19 23:41 ` [PATCH 5/7] bug: Clean up helper macros to remove __WARN_TAINT() Kees Cook
2019-08-19 23:41 ` [PATCH 6/7] bug: Consolidate __WARN_FLAGS usage Kees Cook
2019-08-19 23:41 ` [PATCH 7/7] bug: Move WARN_ON() "cut here" into exception handler Kees Cook
2019-08-20 10:06 ` Peter Zijlstra
2019-08-20 10:58 ` Christophe Leroy
2019-08-20 16:33 ` Kees Cook
2019-08-21 0:50 ` Steven Rostedt
2019-08-21 1:14 ` Steven Rostedt
2019-08-24 17:17 ` 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=20190819234111.9019-2-keescook@chromium.org \
--to=keescook@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=bp@suse.de \
--cc=christophe.leroy@c-s.fr \
--cc=ddavenport@chromium.org \
--cc=feng.tang@intel.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab+samsung@kernel.org \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=yuehaibing@huawei.com \
/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).