Commit 11bb1678 authored by Kees Cook's avatar Kees Cook
Browse files

integer-wrap: Force full rebuild when .scl file changes 



Since the integer wrapping sanitizer's behavior depends on its associated
.scl file, we must force a full rebuild if the file changes. If not,
instrumentation may differ between targets based on when they were built.

Generate a new header file, integer-wrap.h, any time the Clang .scl
file changes. Include the header file in compiler-version.h when its
associated feature name, INTEGER_WRAP, is defined. This will be picked
up by fixdep and force rebuilds where needed.

Acked-by: default avatarJustin Stitt <justinstitt@google.com>
Link: https://lore.kernel.org/r/20250503184623.2572355-3-kees@kernel.org


Reviewed-by: default avatarNicolas Schier <n.schier@avm.de>
Signed-off-by: default avatarKees Cook <kees@kernel.org>
parent 056000c4

include/linux/compiler-version.h

+10 −0
Original line number Diff line number Diff line
@@ -32,3 +32,13 @@ 
#ifdef RANDSTRUCT

#include <generated/randstruct_hash.h>

#endif



/*

 * If any external changes affect Clang's integer wrapping sanitizer

 * behavior, a full rebuild is needed as the coverage for wrapping types

 * may have changed, which may impact the expected behaviors that should

 * not differ between compilation units.

 */

#ifdef INTEGER_WRAP

#include <generated/integer-wrap.h>

#endif

scripts/Makefile.ubsan

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ ubsan-cflags-$(CONFIG_UBSAN_TRAP) += $(call cc-option,-fsanitize-trap=undefined 
export CFLAGS_UBSAN := $(ubsan-cflags-y)



ubsan-integer-wrap-cflags-$(CONFIG_UBSAN_INTEGER_WRAP)     +=	\

	-DINTEGER_WRAP						\

	-fsanitize-undefined-ignore-overflow-pattern=all	\

	-fsanitize=signed-integer-overflow			\

	-fsanitize=unsigned-integer-overflow			\

scripts/basic/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -14,3 +14,8 @@ cmd_create_randstruct_seed = \ 
$(obj)/randstruct.seed: $(gen-randstruct-seed) FORCE

	$(call if_changed,create_randstruct_seed)

always-$(CONFIG_RANDSTRUCT) += randstruct.seed



# integer-wrap: if the .scl file changes, we need to do a full rebuild.

$(obj)/../../include/generated/integer-wrap.h: $(srctree)/scripts/integer-wrap-ignore.scl FORCE

	$(call if_changed,touch)

always-$(CONFIG_UBSAN_INTEGER_WRAP) += ../../include/generated/integer-wrap.h