sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'v6.16-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Browse Source 
Pull crypto fix from Herbert Xu:
 "Fix a buffer overflow regression in shash"

* tag 'v6.16-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: shash - Fix buffer overrun in import function
This commit is contained in:
Linus Torvalds
2025-05-28 14:43:00 -07:00
parent 1cbf99e47f 0a84874c7e
commit 408aa67404
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/shash.c
View File

@@ -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;