lkml.org 
[lkml]   [2019]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 241/271] include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures
    Date
    From: Drew Davenport <ddavenport@chromium.org>

    commit 6b15f678fb7d5ef54e089e6ace72f007fe6e9895 upstream.

    For architectures using __WARN_TAINT, the WARN_ON macro did not print
    out the "cut here" string. The other WARN_XXX macros would print "cut
    here" inside __warn_printk, which is not called for WARN_ON since it
    doesn't have a message to print.

    Link: http://lkml.kernel.org/r/20190624154831.163888-1-ddavenport@chromium.org
    Fixes: a7bed27af194 ("bug: fix "cut here" location for __WARN_TAINT architectures")
    Signed-off-by: Drew Davenport <ddavenport@chromium.org>
    Acked-by: Kees Cook <keescook@chromium.org>
    Tested-by: Kees Cook <keescook@chromium.org>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/asm-generic/bug.h | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/include/asm-generic/bug.h
    +++ b/include/asm-generic/bug.h
    @@ -104,8 +104,10 @@ extern void warn_slowpath_null(const cha
    warn_slowpath_fmt_taint(__FILE__, __LINE__, taint, arg)
    #else
    extern __printf(1, 2) void __warn_printk(const char *fmt, ...);
    -#define __WARN() __WARN_TAINT(TAINT_WARN)
    -#define __WARN_printf(arg...) do { __warn_printk(arg); __WARN(); } while (0)
    +#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

    \
     
     \ /
      Last update: 2019-07-25 07:48    [W:5.718 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site