diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2026-02-15 00:06:51 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2026-02-15 00:06:51 +0300 |
| commit | 273a171dee33cb77070d7259c469d9440548c7df (patch) | |
| tree | d82dffe3e4affbce24e05db216d9450743aae625 /lib | |
| parent | 19a5d9ba6208e9006a2a9d5962aea4d6e427d8ab (diff) | |
| parent | ab2e361ca97a42b7af8be1d273646b30d3b75bf3 (diff) | |
| download | linux-273a171dee33cb77070d7259c469d9440548c7df.tar.xz | |
Merge branch 'next' into for-linus
Prepare input updates for 7.0 merge window.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.debug | 3 | ||||
| -rw-r--r-- | lib/crypto/tests/sha256_kunit.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 3034e294d50d..713cc94caa02 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -445,8 +445,7 @@ config FRAME_WARN default 2048 if GCC_PLUGIN_LATENT_ENTROPY default 2048 if PARISC default 1536 if (!64BIT && XTENSA) - default 1280 if KASAN && !64BIT - default 1024 if !64BIT + default 1280 if !64BIT default 2048 if 64BIT help Tell the compiler to warn at build time for stack frames larger than this. diff --git a/lib/crypto/tests/sha256_kunit.c b/lib/crypto/tests/sha256_kunit.c index dcedfca06df6..5dccdee79693 100644 --- a/lib/crypto/tests/sha256_kunit.c +++ b/lib/crypto/tests/sha256_kunit.c @@ -68,6 +68,7 @@ static void test_sha256_finup_2x(struct kunit *test) rand_bytes(data1_buf, max_data_len); rand_bytes(data2_buf, max_data_len); rand_bytes(salt, sizeof(salt)); + memset(ctx, 0, sizeof(*ctx)); for (size_t i = 0; i < 500; i++) { size_t salt_len = rand_length(sizeof(salt)); |
