diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2025-05-26 16:56:46 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2025-05-27 13:43:32 +0800 |
| commit | 0a84874c7e7dde5cdddc80a82093120e924a348b (patch) | |
| tree | 375258bee154e1288056eb10860a9f8ca6fd3ae0 /crypto | |
| parent | x86/fpu: Fix irq_fpu_usable() to return false during CPU onlining (diff) | |
| download | wireguard-linux-0a84874c7e7dde5cdddc80a82093120e924a348b.tar.xz wireguard-linux-0a84874c7e7dde5cdddc80a82093120e924a348b.zip | |
crypto: shash - Fix buffer overrun in import function
Only set the partial block length to zero if the algorithm is
block-only. Otherwise the descriptor context could be empty,
e.g., for digest_null.
Reported-by: syzbot+4851c19615d35f0e4d68@syzkaller.appspotmail.com
Fixes: 7650f826f7b2 ("crypto: shash - Handle partial blocks in API")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/shash.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/shash.c b/crypto/shash.c index 37537d7995c7..4721f5f134f4 100644 --- a/crypto/shash.c +++ b/crypto/shash.c @@ -257,12 +257,13 @@ static int __crypto_shash_import(struct shash_desc *desc, const void *in, if (crypto_shash_get_flags(tfm) & CRYPTO_TFM_NEED_KEY) return -ENOKEY; - plen = crypto_shash_blocksize(tfm) + 1; - descsize = crypto_shash_descsize(tfm); ss = crypto_shash_statesize(tfm); - buf[descsize - 1] = 0; - if (crypto_shash_block_only(tfm)) + if (crypto_shash_block_only(tfm)) { + plen = crypto_shash_blocksize(tfm) + 1; ss -= plen; + descsize = crypto_shash_descsize(tfm); + buf[descsize - 1] = 0; + } if (!import) { memcpy(buf, in, ss); return 0; |