Commit 06c1c49d authored by Kees Cook's avatar Kees Cook
Browse files

fortify: Adjust KUnit test for modular build 



A much better "unknown size" string pointer is available directly from
struct test, so use that instead of a global that isn't shared with
modules.

Reported-by: default avatarNathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/lkml/YyCOHOchVuE/E7vS@dev-arch.thelio-3990X


Fixes: 875bfd52 ("fortify: Add KUnit test for FORTIFY_SOURCE internals")
Cc: linux-hardening@vger.kernel.org
Build-tested-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
parent c5783af3

lib/fortify_kunit.c

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


#include <kunit/test.h>

#include <linux/string.h>

#include <linux/init.h>



static const char array_of_10[] = "this is 10";

static const char *ptr_of_11 = "this is 11!";
@@ -31,7 +30,7 @@ static void known_sizes_test(struct kunit *test) 


	KUNIT_EXPECT_EQ(test, __compiletime_strlen(array_unknown), SIZE_MAX);

	/* Externally defined and dynamically sized string pointer: */

	KUNIT_EXPECT_EQ(test, __compiletime_strlen(saved_command_line), SIZE_MAX);

	KUNIT_EXPECT_EQ(test, __compiletime_strlen(test->name), SIZE_MAX);

}



/* This is volatile so the optimizer can't perform DCE below. */