diff options
| author | Kees Cook <keescook@chromium.org> | 2022-09-13 10:28:56 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2022-09-14 07:04:15 -0700 |
| commit | 06c1c49d0cd1d6cec5b78963109ba728e49e0063 (patch) | |
| tree | 8533276c139e4224e8530f9ea5311e400e673fea /lib/fortify_kunit.c | |
| parent | c5783af354688b24abd359f7086c282ec74de993 (diff) | |
| download | linux-stable-06c1c49d0cd1d6cec5b78963109ba728e49e0063.tar.gz linux-stable-06c1c49d0cd1d6cec5b78963109ba728e49e0063.tar.bz2 linux-stable-06c1c49d0cd1d6cec5b78963109ba728e49e0063.zip | |
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: Nathan Chancellor <nathan@kernel.org>
Link: https://lore.kernel.org/lkml/YyCOHOchVuE/E7vS@dev-arch.thelio-3990X
Fixes: 875bfd5276f3 ("fortify: Add KUnit test for FORTIFY_SOURCE internals")
Cc: linux-hardening@vger.kernel.org
Build-tested-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'lib/fortify_kunit.c')
| -rw-r--r-- | lib/fortify_kunit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/fortify_kunit.c b/lib/fortify_kunit.c index 99bc0ea60d27..409af07f340a 100644 --- a/lib/fortify_kunit.c +++ b/lib/fortify_kunit.c @@ -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. */ |