Commit 056000c4 authored May 03, 2025 by Kees Cook

randstruct: Force full rebuild when seed changes

While the randstruct GCC plugin was being rebuilt if the randstruct seed
changed, Clang builds did not notice the change. This could result in
differing struct layouts in a target depending on when it was built.

Include the existing generated header file in compiler-version.h when
its associated feature name, RANDSTRUCT, is defined. This will be picked
up by fixdep and force rebuilds where needed.

Link: https://lore.kernel.org/r/20250503184623.2572355-2-kees@kernel.org


Reviewed-by: Nicolas Schier <n.schier@avm.de>
Tested-by: Nicolas Schier <n.schier@avm.de>
Signed-off-by: Kees Cook <kees@kernel.org>

parent 0cecd37d

include/linux/compiler-version.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -23,3 +23,12 @@
		#ifdef GCC_PLUGINS
		#include <generated/gcc-plugins.h>
		#endif

		/*
		* If the randstruct seed itself changes (whether for GCC plugins or
		* Clang), the entire tree needs to be rebuilt since the randomization of
		* structures may change between compilation units if not.
		*/
		#ifdef RANDSTRUCT
		#include <generated/randstruct_hash.h>
		#endif

include/linux/vermagic.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,6 @@
		#define MODULE_VERMAGIC_MODVERSIONS ""
		#endif
		#ifdef RANDSTRUCT
		#include <generated/randstruct_hash.h>
		#define MODULE_RANDSTRUCT "RANDSTRUCT_" RANDSTRUCT_HASHED_SEED
		#else
		#define MODULE_RANDSTRUCT