|
Message-Id: <1491343938-75336-3-git-send-email-keescook@chromium.org> Date: Tue, 4 Apr 2017 15:12:13 -0700 From: Kees Cook <keescook@...omium.org> To: Ingo Molnar <mingo@...nel.org> Cc: Kees Cook <keescook@...omium.org>, Peter Zijlstra <peterz@...radead.org>, "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>, Kalle Valo <kvalo@...eaurora.org>, Andrew Morton <akpm@...ux-foundation.org>, Rik van Riel <riel@...hat.com>, Jakub Kicinski <jakub.kicinski@...ronome.com>, Viresh Kumar <viresh.kumar@...aro.org>, Andy Shevchenko <andriy.shevchenko@...ux.intel.com>, Geert Uytterhoeven <geert@...ux-m68k.org>, Olof Johansson <olof@...om.net>, Chris Wilson <chris@...is-wilson.co.uk>, George Spelvin <linux@...encehorizons.net>, Thomas Gleixner <tglx@...utronix.de>, Josh Poimboeuf <jpoimboe@...hat.com>, David Windsor <dwindsor@...il.com>, linux-kernel@...r.kernel.org, kernel-hardening@...ts.openwall.com Subject: [PATCH v2 2/7] bug: Improve unlikely() in data corruption check This improves the compiler branch-hinting used in CHECK_DATA_CORRUPTION(), similar to how it is done in WARN_ON() and friends. Signed-off-by: Kees Cook <keescook@...omium.org> --- include/linux/bug.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/bug.h b/include/linux/bug.h index db1e41c69bac..b6cfcb7f778f 100644 --- a/include/linux/bug.h +++ b/include/linux/bug.h @@ -130,15 +130,15 @@ static inline enum bug_trap_type report_bug(unsigned long bug_addr, static inline __must_check bool check_data_corruption(bool v) { return v; } #define CHECK_DATA_CORRUPTION(condition, fmt, ...) \ check_data_corruption(({ \ - bool corruption = unlikely(condition); \ - if (corruption) { \ + bool corruption = !!(condition); \ + if (unlikely(corruption)) { \ if (IS_ENABLED(CONFIG_BUG_ON_DATA_CORRUPTION)) { \ pr_err(fmt, ##__VA_ARGS__); \ BUG(); \ } else \ WARN(1, fmt, ##__VA_ARGS__); \ } \ - corruption; \ + unlikely(corruption); \ })) #endif /* _LINUX_BUG_H */ -- 2.7.4
Powered by blists - more mailing lists
Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.