@@ -450,6 +450,29 @@ struct ftrace_likely_data {
/* Are two types/vars the same type (ignoring qualifiers)? */
#define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
+/* Is the variable addressable? */
+#define __is_ptr_or_array(p) \
+ (__builtin_classify_type(p) == __builtin_classify_type(NULL))
+
+/* Return an array decayed to a pointer. */
+#define __decay(p) \
+ (&*__builtin_choose_expr(__is_ptr_or_array(p), p, NULL))
+
+/* Report if variable is a pointer type. */
+#define __is_ptr(p) __same_type(p, __decay(p))
+
+/* Always produce an integral expression, with specific type/vale fallback. */
+#define ___force_integral_expr(x, type, val) \
+ __builtin_choose_expr(!__is_ptr(x), (x), (type)val)
+#define __force_integral_expr(x) \
+ ___force_integral_expr(x, int, 0)
+
+/* Always produce a pointer expression, with specific type/value fallback. */
+#define ___force_ptr_expr(x, type, value) \
+ __builtin_choose_expr(__is_ptr(x), (x), &(type){ value })
+#define __force_ptr_expr(x) \
+ __builtin_choose_expr(__is_ptr(x), (x), NULL)
+
/*
* __unqual_scalar_typeof(x) - Declare an unqualified scalar type, leaving
* non-scalar types unchanged.
Many compiler builtins (e.g. _Generic, __builtin_choose_expr) perform integral vs pointer argument type evaluation on outputs before evaluating the input expression. This means that all outputs must be syntactically valid for all inputs, even if the output would be otherwise filtering the types. For example, this will fail to build: #define handle_int_or_ptr(x) \ _Generic((x), \ int: handle_int(x), \ int *: handle_ptr(x)) ... handle_int_or_ptr(7); error: passing argument 1 of 'handle_ptr' makes pointer from integer without a cast [-Wint-conversion] 108 | handle_int_or_ptr(x); | ^ | | | int To deal with this, provide helpers that force expressions into the desired type, where the mismatched cases are syntactically value, but will never actually happen: #define handle_int_or_ptr(x) \ _Generic((x), \ int: handle_int(__force_integral_expr(x)), \ int *: handle_ptr(__force_ptr_expr(x))) Now handle_int() only ever sees an int, and handle_ptr() only ever sees a pointer, regardless of the input type. Signed-off-by: Kees Cook <kees@kernel.org> --- Cc: Nick Desaulniers <ndesaulniers@google.com> Cc: Miguel Ojeda <ojeda@kernel.org> Cc: Marco Elver <elver@google.com> Cc: Nathan Chancellor <nathan@kernel.org> Cc: Hao Luo <haoluo@google.com> Cc: Przemek Kitszel <przemyslaw.kitszel@intel.com> --- include/linux/compiler_types.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)