diff options
| author | Kees Cook <keescook@chromium.org> | 2023-02-02 21:43:28 +0300 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2023-02-02 21:43:28 +0300 |
| commit | 5c0f220e1b2d349b6241375e19887b5c865a84a1 (patch) | |
| tree | e6f473fcc9d2b7929276408a39b46b3c7452a337 /lib | |
| parent | 5a6b64adc18d9adfb497a529ff004d59b6df151f (diff) | |
| parent | be0d8f48ad97f5b775b0af3310343f676dbf318a (diff) | |
| download | linux-5c0f220e1b2d349b6241375e19887b5c865a84a1.tar.xz | |
Merge branch 'for-linus/hardening' into for-next/hardening
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 9 | ||||
| -rw-r--r-- | lib/memcpy_kunit.c | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 881c3f84e88a..149d6403b8a9 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2566,6 +2566,15 @@ config MEMCPY_KUNIT_TEST If unsure, say N. +config MEMCPY_SLOW_KUNIT_TEST + bool "Include exhaustive memcpy tests" + depends on MEMCPY_KUNIT_TEST + default y + help + Some memcpy tests are quite exhaustive in checking for overlaps + and bit ranges. These can be very slow, so they are split out + as a separate config, in case they need to be disabled. + config IS_SIGNED_TYPE_KUNIT_TEST tristate "Test is_signed_type() macro" if !KUNIT_ALL_TESTS depends on KUNIT diff --git a/lib/memcpy_kunit.c b/lib/memcpy_kunit.c index 89128551448d..887926f04731 100644 --- a/lib/memcpy_kunit.c +++ b/lib/memcpy_kunit.c @@ -309,6 +309,8 @@ static void set_random_nonzero(struct kunit *test, u8 *byte) static void init_large(struct kunit *test) { + if (!IS_ENABLED(CONFIG_MEMCPY_SLOW_KUNIT_TEST)) + kunit_skip(test, "Slow test skipped. Enable with CONFIG_MEMCPY_SLOW_KUNIT_TEST=y"); /* Get many bit patterns. */ get_random_bytes(large_src, ARRAY_SIZE(large_src)); |