]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
dm: dm-zoned: Adjust dmz_load_mapping() allocation type
authorKees Cook <kees@kernel.org>
Sat, 26 Apr 2025 06:17:08 +0000 (23:17 -0700)
committerKees Cook <kees@kernel.org>
Thu, 19 Feb 2026 18:05:20 +0000 (10:05 -0800)
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 dmz_mblock **" but the returned type will
be "struct dmz_mblk **". These are the same allocation size (pointer
size), but the types do not match. Adjust the allocation type to match
the assignment.

Link: https://patch.msgid.link/20250426061707.work.587-kees@kernel.org
Signed-off-by: Kees Cook <kees@kernel.org>
drivers/md/dm-zoned-metadata.c

index deff22ecccbb832e8db9ce4ab7415bb0a69456e2..83fcd7b31ed9b6fe4456ef34ad6c49e7ecde5b15 100644 (file)
@@ -1687,7 +1687,7 @@ static int dmz_load_mapping(struct dmz_metadata *zmd)
 
        /* Metadata block array for the chunk mapping table */
        zmd->map_mblk = kcalloc(zmd->nr_map_blocks,
-                               sizeof(struct dmz_mblk *), GFP_KERNEL);
+                               sizeof(struct dmz_mblock *), GFP_KERNEL);
        if (!zmd->map_mblk)
                return -ENOMEM;