| From: Andrew Morton <akpm@linux-foundation.org> |
| Subject: minmax-sanity-check-constant-bounds-when-clamping-checkpatch-fixes-fix |
| Date: Tue Oct 18 11:59:57 AM PDT 2022 |
| |
| s@&&\@&& \@ |
| |
| Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Cc: "Jason A. Donenfeld" <Jason@zx2c4.com> |
| Cc: Kees Cook <keescook@chromium.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| include/linux/minmax.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/include/linux/minmax.h~minmax-sanity-check-constant-bounds-when-clamping-checkpatch-fixes-fix |
| +++ a/include/linux/minmax.h |
| @@ -52,8 +52,8 @@ |
| |
| #define __careful_clamp(val, lo, hi) ({ \ |
| __clamp_input_check(lo, hi) + \ |
| - __builtin_choose_expr(__typecheck(val, lo) && __typecheck(val, hi) &&\ |
| - __typecheck(hi, lo) && __is_constexpr(val) &&\ |
| + __builtin_choose_expr(__typecheck(val, lo) && __typecheck(val, hi) && \ |
| + __typecheck(hi, lo) && __is_constexpr(val) && \ |
| __is_constexpr(lo) && __is_constexpr(hi), \ |
| __clamp(val, lo, hi), \ |
| __clamp_once(val, lo, hi, __UNIQUE_ID(__val), \ |
| _ |
