From: Kees Cook Date: Sat, 26 Apr 2025 06:16:30 +0000 (-0700) Subject: dm-crypt: Adjust crypt_alloc_tfms_aead() allocation type X-Git-Tag: v7.0-rc1~36^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6fcccd5398775624582777776113dd220db2bbd;p=thirdparty%2Fkernel%2Flinux.git dm-crypt: Adjust crypt_alloc_tfms_aead() allocation type In preparation for making the kmalloc family of allocators type aware, we need to make sure that the returned type from the allocation matches the type of the variable being assigned. (Before, the allocator would always return "void *", which can be implicitly cast to any pointer type.) The assigned type is "struct crypto_skcipher **" but the returned type will be "struct crypto_aead **". These are the same allocation size (pointer size), but the types don't match. Adjust the allocation type to match the assignment. Link: https://patch.msgid.link/20250426061629.work.266-kees@kernel.org Signed-off-by: Kees Cook --- diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index cd279a4f335d..339976d4c2ca 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -2364,7 +2364,7 @@ static int crypt_alloc_tfms_aead(struct crypt_config *cc, char *ciphermode) { int err; - cc->cipher_tfm.tfms = kmalloc(sizeof(struct crypto_aead *), GFP_KERNEL); + cc->cipher_tfm.tfms = kmalloc(sizeof(struct crypto_skcipher *), GFP_KERNEL); if (!cc->cipher_tfm.tfms) return -ENOMEM;