Commit 10299c07 authored by Kees Cook's avatar Kees Cook
Browse files

kunit/fortify: Add back "volatile" for sizeof() constants 



It seems the Clang can see through OPTIMIZER_HIDE_VAR when the constant
is coming from sizeof. Adding "volatile" back to these variables solves
this false positive without reintroducing the issues that originally led
to switching to OPTIMIZER_HIDE_VAR in the first place[1].

Reported-by: default avatarNathan Chancellor <nathan@kernel.org>
Closes: https://github.com/ClangBuiltLinux/linux/issues/2075

 [1]
Cc: Jannik Glückert <jannik.glueckert@gmail.com>
Suggested-by: default avatarNathan Chancellor <nathan@kernel.org>
Fixes: 6ee149f6 ("kunit/fortify: Replace "volatile" with OPTIMIZER_HIDE_VAR()")
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/r/20250628234034.work.800-kees@kernel.org


Signed-off-by: default avatarKees Cook <kees@kernel.org>
parent 5e54510a

lib/tests/fortify_kunit.c

+2 −2
Original line number Diff line number Diff line
@@ -1003,8 +1003,8 @@ static void fortify_test_memcmp(struct kunit *test) 
{

	char one[] = "My mind is going ...";

	char two[] = "My mind is going ... I can feel it.";

	size_t one_len = sizeof(one) - 1;

	size_t two_len = sizeof(two) - 1;

	volatile size_t one_len = sizeof(one) - 1;

	volatile size_t two_len = sizeof(two) - 1;



	OPTIMIZER_HIDE_VAR(one_len);

	OPTIMIZER_HIDE_VAR(two_len);