lkml.org 
[lkml]   [2019]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/7] bug: Consolidate warn_slowpath_fmt() usage
    Date
    Instead of having a separate helper for no printk output, just
    consolidate the logic into warn_slowpath_fmt().

    Signed-off-by: Kees Cook <keescook@chromium.org>
    ---
    include/asm-generic/bug.h | 3 +--
    kernel/panic.c | 14 +++++++-------
    2 files changed, 8 insertions(+), 9 deletions(-)

    diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
    index e9166a24b336..f76efbcbe3b5 100644
    --- a/include/asm-generic/bug.h
    +++ b/include/asm-generic/bug.h
    @@ -93,9 +93,8 @@ struct bug_entry {
    extern __printf(4, 5)
    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() __WARN_printf(TAINT_WARN, NULL)
    #define __WARN_printf(taint, arg...) \
    warn_slowpath_fmt(__FILE__, __LINE__, taint, arg)
    #else
    diff --git a/kernel/panic.c b/kernel/panic.c
    index 4d8b7577c82c..51efdeb2558e 100644
    --- a/kernel/panic.c
    +++ b/kernel/panic.c
    @@ -597,19 +597,19 @@ void warn_slowpath_fmt(const char *file, int line, unsigned taint,
    {
    struct warn_args args;

    + if (!fmt) {
    + pr_warn(CUT_HERE);
    + __warn(file, line, __builtin_return_address(0), taint,
    + NULL, NULL);
    + return;
    + }
    +
    args.fmt = fmt;
    va_start(args.args, fmt);
    __warn(file, line, __builtin_return_address(0), taint, NULL, &args);
    va_end(args.args);
    }
    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
    void __warn_printk(const char *fmt, ...)
    {
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-08-20 01:44    [W:4.135 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site