diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-24 10:46:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-24 10:46:54 -0700 |
| commit | 1cfb46051db9ddb68e297eaf17270e09874ec5f3 (patch) | |
| tree | 7a10d273671465181392d02b854ed3211a6faddf /drivers/crypto | |
| parent | e1b061b444fb01c237838f0d8238653afe6a8094 (diff) | |
| parent | 44ac4625ea002deecd0c227336c95b724206c698 (diff) | |
Merge tag 'v6.12-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- Disable buggy p10 aes-gcm code on powerpc
- Fix module aliases in paes_s390
- Fix buffer overread in caam
* tag 'v6.12-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: powerpc/p10-aes-gcm - Disable CRYPTO_AES_GCM_P10
crypto: s390/paes - Fix module aliases
crypto: caam - Pad SG length when allocating hash edesc
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/caam/caamhash.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index fdd724228c2f..25c02e267258 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -708,6 +708,7 @@ static struct ahash_edesc *ahash_edesc_alloc(struct ahash_request *req, GFP_KERNEL : GFP_ATOMIC; struct ahash_edesc *edesc; + sg_num = pad_sg_nents(sg_num); edesc = kzalloc(struct_size(edesc, sec4_sg, sg_num), flags); if (!edesc) return NULL; |