aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-10-10 10:47:35 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-10-10 10:47:35 -0700
commit832b5d0bf94cab3ab1ca690fca3c3d931f5fa7cd (patch)
tree10ba9399711689023c779af47a5286b7622092d8
parent68d187ec14a86542f7828d1c394afaca79a3ad40 (diff)
parent152d0bcdf1efcb54a4fa20f694e9c7bbb6d06cbf (diff)
downloadlinux-832b5d0bf94cab3ab1ca690fca3c3d931f5fa7cd.tar.gz
Merge tag 'v6.6-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "Fix a regression in dm-crypt" * tag 'v6.6-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: dm crypt: Fix reqsize in crypt_iv_eboiv_gen
-rw-r--r--drivers/md/dm-crypt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index f2662c21a6dfe7..5315fd261c23b7 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -753,7 +753,8 @@ static int crypt_iv_eboiv_gen(struct crypt_config *cc, u8 *iv,
int err;
u8 *buf;
- reqsize = ALIGN(crypto_skcipher_reqsize(tfm), __alignof__(__le64));
+ reqsize = sizeof(*req) + crypto_skcipher_reqsize(tfm);
+ reqsize = ALIGN(reqsize, __alignof__(__le64));
req = kmalloc(reqsize + cc->iv_size, GFP_NOIO);
if (!req)