dm: dm-zoned: Adjust dmz_load_mapping() allocation type
PATCH 1/1 dm: dm-zoned: Adjust dmz_load_mapping() 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 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.
---
Cc: Alasdair Kergon <[email protected]>
Cc: Mike Snitzer <[email protected]>
Cc: Mikulas Patocka <[email protected]>
Cc: <[email protected]>
--- drivers/md/dm-zoned-metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-zoned-metadata.c +1 -1
@@ -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 (*zmd->map_mblk),GFP_KERNEL );if (!zmd->map_mblk)return -ENOMEM ;
Signature · 1 line
2.34.1
Mikulas Patocka
maintainerHi
I accepted both patches.
Just nit-picking - I prefer type name as an argument to the sizeof operator rather than variable name - because when someone needs to find out where variables with a particular type are allocated, it can be easily done with grep if the sizeof operator contains the type name. So I changed your patches so that there are type names.
Mikulas
Quoted 36 lines · Kees Cook
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 "structdmz_mblk**". These are the same allocation size (pointer size), but the types do not match. Adjust the allocation type to match the assignment.Signed-off-by Kees Cook <[email protected]>---
Cc: Alasdair Kergon <[email protected]>
Cc: Mike Snitzer <[email protected]>
Cc: Mikulas Patocka <[email protected]>
Cc: <[email protected]>--- drivers/md/dm-zoned-metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/md/dm-zoned-metadata.c +1
-1@@ -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 (*zmd->map_mblk),GFP_KERNEL );if (!zmd->map_mblk)return -ENOMEM ;Signature · 1 line
2.34.1
Quoted 7 lines · Mikulas Patocka
I accepted both patches.
Just nit-picking - I prefer type name as an argument to the sizeof operator rather than variable name - because when someone needs to find out where variables with a particular type are allocated, it can be easily done with grep if the sizeof operator contains the type name. So I changed your patches so that there are type names.
Thanks for the fix-ups! I wanted to check on these patches, though, since I still don't see them in -next and the merge window is expected to open next week.
Thanks!
-Kees
Signature · 1 line
Kees Cook