The patch titled
Subject: kernelh-skip-single-eval-logic-on-literals-in-min-max-v3
has been removed from the -mm tree. Its filename was
kernelh-skip-single-eval-logic-on-literals-in-min-max-v3.patch
This patch was dropped because it was folded into kernelh-skip-single-eval-logic-on-literals-in-min-max.patch
------------------------------------------------------
From: Kees Cook <keescook@xxxxxxxxxxxx>
Subject: kernelh-skip-single-eval-logic-on-literals-in-min-max-v3
drop __builtin_types_compatible_p() (Rasmus, Linus)
Link: http://lkml.kernel.org/r/20180309200536.GA5670@beast
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: Josh Poimboeuf <jpoimboe@xxxxxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/kernel.h | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff -puN include/linux/kernel.h~kernelh-skip-single-eval-logic-on-literals-in-min-max-v3 include/linux/kernel.h
--- a/include/linux/kernel.h~kernelh-skip-single-eval-logic-on-literals-in-min-max-v3
+++ a/include/linux/kernel.h
@@ -805,8 +805,7 @@ static inline void ftrace_dump(enum ftra
*/
#define __min(t1, t2, x, y) \
__builtin_choose_expr(__builtin_constant_p(x) && \
- __builtin_constant_p(y) && \
- __builtin_types_compatible_p(t1, t2), \
+ __builtin_constant_p(y), \
(t1)(x) < (t2)(y) ? (t1)(x) : (t2)(y), \
__single_eval_min(t1, t2, \
__UNIQUE_ID(min1_), \
@@ -828,8 +827,7 @@ static inline void ftrace_dump(enum ftra
#define __max(t1, t2, x, y) \
__builtin_choose_expr(__builtin_constant_p(x) && \
- __builtin_constant_p(y) && \
- __builtin_types_compatible_p(t1, t2), \
+ __builtin_constant_p(y), \
(t1)(x) > (t2)(y) ? (t1)(x) : (t2)(y), \
__single_eval_max(t1, t2, \
__UNIQUE_ID(max1_), \
_
Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are
taint-convert-to-indexed-initialization.patch
taint-consolidate-documentation.patch
taint-add-taint-for-randstruct.patch
kernelh-skip-single-eval-logic-on-literals-in-min-max.patch
test_bitmap-do-not-accidentally-use-stack-vla.patch
fork-unconditionally-clear-stack-on-fork.patch
exec-pass-stack-rlimit-into-mm-layout-functions.patch
exec-introduce-finalize_exec-before-start_thread.patch
exec-pin-stack-limit-during-exec.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
