treewide: Replace kmalloc with kmalloc_obj for non-scalar types

This is the result of running the Coccinelle script from
scripts/coccinelle/api/kmalloc_objs.cocci. The script is designed to
avoid scalar types (which need careful case-by-case checking), and
instead replace kmalloc-family calls that allocate struct or union
object instances:

Single allocations:	kmalloc(sizeof(TYPE), ...)
are replaced with:	kmalloc_obj(TYPE, ...)

Array allocations:	kmalloc_array(COUNT, sizeof(TYPE), ...)
are replaced with:	kmalloc_objs(TYPE, COUNT, ...)

Flex array allocations:	kmalloc(struct_size(PTR, FAM, COUNT), ...)
are replaced with:	kmalloc_flex(*PTR, FAM, COUNT, ...)

(where TYPE may also be *VAR)

The resulting allocations no longer return "void *", instead returning
"TYPE *".

Signed-off-by: Kees Cook <kees@kernel.org>

1 files changed, 6 insertions, 7 deletions

diff --git a/fs/nfs/blocklayout/dev.c b/fs/nfs/blocklayout/dev.c
index 134d7f760a33..cc6327d97a91 100644
--- a/fs/nfs/blocklayout/dev.c
+++ b/fs/nfs/blocklayout/dev.c
@@ -461,8 +461,8 @@ bl_parse_concat(struct nfs_server *server, struct pnfs_block_dev *d,
 	u64 len = 0;
 	int ret, i;
 
-	d->children = kcalloc(v->concat.volumes_count,
-			sizeof(struct pnfs_block_dev), gfp_mask);
+	d->children = kzalloc_objs(struct pnfs_block_dev,
+				   v->concat.volumes_count, gfp_mask);
 	if (!d->children)
 		return -ENOMEM;
 
@@ -490,8 +490,8 @@ bl_parse_stripe(struct nfs_server *server, struct pnfs_block_dev *d,
 	u64 len = 0;
 	int ret, i;
 
-	d->children = kcalloc(v->stripe.volumes_count,
-			sizeof(struct pnfs_block_dev), gfp_mask);
+	d->children = kzalloc_objs(struct pnfs_block_dev,
+				   v->stripe.volumes_count, gfp_mask);
 	if (!d->children)
 		return -ENOMEM;
 
@@ -559,8 +559,7 @@ bl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,
 		goto out_free_scratch;
 	nr_volumes = be32_to_cpup(p++);
 
-	volumes = kcalloc(nr_volumes, sizeof(struct pnfs_block_volume),
-			  gfp_mask);
+	volumes = kzalloc_objs(struct pnfs_block_volume, nr_volumes, gfp_mask);
 	if (!volumes)
 		goto out_free_scratch;
 
@@ -570,7 +569,7 @@ bl_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,
 			goto out_free_volumes;
 	}
 
-	top = kzalloc(sizeof(*top), gfp_mask);
+	top = kzalloc_obj(*top, gfp_mask);
 	if (!top)
 		goto out_free_volumes;