diff options
| author | Kees Cook <keescook@chromium.org> | 2017-02-24 15:00:38 -0800 |
|---|---|---|
| committer | Satya Tangirala <satyat@google.com> | 2018-09-21 14:51:18 -0700 |
| commit | a3772a806a04164f2fc9a956bb997c4b8c8179e9 (patch) | |
| tree | 9f00aa5079639fb7b49160be0698c989621a6aa1 /include/linux | |
| parent | 3c318e77d1e4d32018def996c1241558822be0e5 (diff) | |
UPSTREAM: bug: switch data corruption check to __must_check
(cherry-picked from 85caa95b9f19bb3a26d7e025d1134760b69e0c40)
The CHECK_DATA_CORRUPTION() macro was designed to have callers do
something meaningful/protective on failure. However, using "return
false" in the macro too strictly limits the design patterns of callers.
Instead, let callers handle the logic test directly, but make sure that
the result IS checked by forcing __must_check (which appears to not be
able to be used directly on macro expressions).
Change-Id: I635dc2f39959104ea8b475d2d5018af3502f33ba
Link: http://lkml.kernel.org/r/20170206204547.GA125312@beast
Signed-off-by: Kees Cook <keescook@chromium.org>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Satya Tangirala <satyat@google.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bug.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/linux/bug.h b/include/linux/bug.h index 2bafb1d6ee89..833746d361cf 100644 --- a/include/linux/bug.h +++ b/include/linux/bug.h @@ -112,18 +112,20 @@ static inline enum bug_trap_type report_bug(unsigned long bug_addr, /* * Since detected data corruption should stop operation on the affected - * structures, this returns false if the corruption condition is found. + * structures. Return value must be checked and sanely acted on by caller. */ +static inline __must_check bool check_data_corruption(bool v) { return v; } #define CHECK_DATA_CORRUPTION(condition, fmt, ...) \ - do { \ - if (unlikely(condition)) { \ + check_data_corruption(({ \ + bool corruption = unlikely(condition); \ + if (corruption) { \ if (IS_ENABLED(CONFIG_BUG_ON_DATA_CORRUPTION)) { \ pr_err(fmt, ##__VA_ARGS__); \ BUG(); \ } else \ WARN(1, fmt, ##__VA_ARGS__); \ - return false; \ } \ - } while (0) + corruption; \ + })) #endif /* _LINUX_BUG_H */ |