]> git.baikalelectronics.ru Git - kernel.git/commitdiff
crypto: lib/blake2s - reduce stack frame usage in self test
authorJason A. Donenfeld <Jason@zx2c4.com>
Mon, 20 Jun 2022 07:52:43 +0000 (09:52 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:24:29 +0000 (14:24 +0200)
commit 1efdb449ecc6361774d8041c5cd297a9fcef300b upstream.

Using 3 blocks here doesn't give us much more than using 2, and it
causes a stack frame size warning on certain compiler/config/arch
combinations:

   lib/crypto/blake2s-selftest.c: In function 'blake2s_selftest':
>> lib/crypto/blake2s-selftest.c:632:1: warning: the frame size of 1088 bytes is larger than 1024 bytes [-Wframe-larger-than=]
     632 | }
         | ^

So this patch just reduces the block from 3 to 2, which makes the
warning go away.

Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/linux-crypto/202206200851.gE3MHCgd-lkp@intel.com
Fixes: 33f982a314cc ("crypto: blake2s - remove shash module")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
lib/crypto/blake2s-selftest.c

index 66f505220f43f074fdf1e79848a72c9b16a503ad..7d77dea1558735425e8325fdbdf6dd1161f6da5c 100644 (file)
@@ -593,7 +593,7 @@ bool __init blake2s_selftest(void)
                enum { TEST_ALIGNMENT = 16 };
                u8 unaligned_block[BLAKE2S_BLOCK_SIZE + TEST_ALIGNMENT - 1]
                                        __aligned(TEST_ALIGNMENT);
-               u8 blocks[BLAKE2S_BLOCK_SIZE * 3];
+               u8 blocks[BLAKE2S_BLOCK_SIZE * 2];
                struct blake2s_state state1, state2;
 
                get_random_bytes(blocks, sizeof(blocks));
@@ -603,8 +603,8 @@ bool __init blake2s_selftest(void)
     defined(CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S)
                memcpy(&state1, &state, sizeof(state1));
                memcpy(&state2, &state, sizeof(state2));
-               blake2s_compress(&state1, blocks, 3, BLAKE2S_BLOCK_SIZE);
-               blake2s_compress_generic(&state2, blocks, 3, BLAKE2S_BLOCK_SIZE);
+               blake2s_compress(&state1, blocks, 2, BLAKE2S_BLOCK_SIZE);
+               blake2s_compress_generic(&state2, blocks, 2, BLAKE2S_BLOCK_SIZE);
                if (memcmp(&state1, &state2, sizeof(state1))) {
                        pr_err("blake2s random compress self-test %d: FAIL\n",
                               i + 1);