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>

18 files changed, 42 insertions, 43 deletions

diff --git a/drivers/media/test-drivers/vicodec/vicodec-core.c b/drivers/media/test-drivers/vicodec/vicodec-core.c
index be846f711969..d3d4bb41c8ea 100644
--- a/drivers/media/test-drivers/vicodec/vicodec-core.c
+++ b/drivers/media/test-drivers/vicodec/vicodec-core.c
@@ -1836,7 +1836,7 @@ static int vicodec_open(struct file *file)
 
 	if (mutex_lock_interruptible(vfd->lock))
 		return -ERESTARTSYS;
-	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+	ctx = kzalloc_obj(*ctx, GFP_KERNEL);
 	if (!ctx) {
 		rc = -ENOMEM;
 		goto open_unlock;
@@ -2105,7 +2105,7 @@ static int vicodec_probe(struct platform_device *pdev)
 	struct vicodec_dev *dev;
 	int ret;
 
-	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+	dev = kzalloc_obj(*dev, GFP_KERNEL);
 	if (!dev)
 		return -ENOMEM;
 
diff --git a/drivers/media/test-drivers/vidtv/vidtv_bridge.c b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
index 438483c62fac..03bb7c79df47 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_bridge.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_bridge.c
@@ -490,7 +490,7 @@ static int vidtv_bridge_probe(struct platform_device *pdev)
 	struct vidtv_dvb *dvb;
 	int ret;
 
-	dvb = kzalloc(sizeof(*dvb), GFP_KERNEL);
+	dvb = kzalloc_obj(*dvb, GFP_KERNEL);
 	if (!dvb)
 		return -ENOMEM;
 
diff --git a/drivers/media/test-drivers/vidtv/vidtv_channel.c b/drivers/media/test-drivers/vidtv/vidtv_channel.c
index 3541155c6fc6..4ba65853c3ed 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_channel.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_channel.c
@@ -67,7 +67,7 @@ struct vidtv_channel
 	const u16 s302m_beethoven_event_id  = 1;
 	struct vidtv_channel *s302m;
 
-	s302m = kzalloc(sizeof(*s302m), GFP_KERNEL);
+	s302m = kzalloc_obj(*s302m, GFP_KERNEL);
 	if (!s302m)
 		return NULL;
 
@@ -389,7 +389,7 @@ static struct vidtv_psi_desc_service_list_entry
 
 			s_desc = (struct vidtv_psi_desc_service *)desc;
 
-			curr_e = kzalloc(sizeof(*curr_e), GFP_KERNEL);
+			curr_e = kzalloc_obj(*curr_e, GFP_KERNEL);
 			if (!curr_e) {
 				vidtv_channel_destroy_service_list(head_e);
 				return NULL;
diff --git a/drivers/media/test-drivers/vidtv/vidtv_demod.c b/drivers/media/test-drivers/vidtv/vidtv_demod.c
index 505f96fccbf3..31ee6d706744 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_demod.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_demod.c
@@ -418,7 +418,7 @@ static int vidtv_demod_i2c_probe(struct i2c_client *client)
 	struct vidtv_demod_state *state;
 
 	/* allocate memory for the internal state */
-	state = kzalloc(sizeof(*state), GFP_KERNEL);
+	state = kzalloc_obj(*state, GFP_KERNEL);
 	if (!state)
 		return -ENOMEM;
 
diff --git a/drivers/media/test-drivers/vidtv/vidtv_mux.c b/drivers/media/test-drivers/vidtv/vidtv_mux.c
index f99878eff7ac..01bed6d82437 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_mux.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_mux.c
@@ -50,7 +50,7 @@ static struct vidtv_mux_pid_ctx
 	if (ctx)
 		return ctx;
 
-	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+	ctx = kzalloc_obj(*ctx, GFP_KERNEL);
 	if (!ctx)
 		return NULL;
 
@@ -480,7 +480,7 @@ struct vidtv_mux *vidtv_mux_init(struct dvb_frontend *fe,
 {
 	struct vidtv_mux *m;
 
-	m = kzalloc(sizeof(*m), GFP_KERNEL);
+	m = kzalloc_obj(*m, GFP_KERNEL);
 	if (!m)
 		return NULL;
 
diff --git a/drivers/media/test-drivers/vidtv/vidtv_psi.c b/drivers/media/test-drivers/vidtv/vidtv_psi.c
index 2a51c898c11e..2cd3f5d7c142 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_psi.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_psi.c
@@ -285,7 +285,7 @@ struct vidtv_psi_desc_service *vidtv_psi_service_desc_init(struct vidtv_psi_desc
 	u32 service_name_len = service_name ? strlen(service_name) : 0;
 	u32 provider_name_len = provider_name ? strlen(provider_name) : 0;
 
-	desc = kzalloc(sizeof(*desc), GFP_KERNEL);
+	desc = kzalloc_obj(*desc, GFP_KERNEL);
 	if (!desc)
 		return NULL;
 
@@ -360,7 +360,7 @@ struct vidtv_psi_desc_network_name
 	u32 network_name_len = network_name ? strlen(network_name) : 0;
 	struct vidtv_psi_desc_network_name *desc;
 
-	desc = kzalloc(sizeof(*desc), GFP_KERNEL);
+	desc = kzalloc_obj(*desc, GFP_KERNEL);
 	if (!desc)
 		return NULL;
 
@@ -390,14 +390,14 @@ struct vidtv_psi_desc_service_list
 	struct vidtv_psi_desc_service_list *desc;
 	u16 length = 0;
 
-	desc = kzalloc(sizeof(*desc), GFP_KERNEL);
+	desc = kzalloc_obj(*desc, GFP_KERNEL);
 	if (!desc)
 		return NULL;
 
 	desc->type = SERVICE_LIST_DESCRIPTOR;
 
 	while (entry) {
-		curr_e = kzalloc(sizeof(*curr_e), GFP_KERNEL);
+		curr_e = kzalloc_obj(*curr_e, GFP_KERNEL);
 		if (!curr_e) {
 			while (head_e) {
 				curr_e = head_e;
@@ -441,7 +441,7 @@ struct vidtv_psi_desc_short_event
 	struct vidtv_psi_desc_short_event *desc;
 	u32 text_len =  text ? strlen(text) : 0;
 
-	desc = kzalloc(sizeof(*desc), GFP_KERNEL);
+	desc = kzalloc_obj(*desc, GFP_KERNEL);
 	if (!desc)
 		return NULL;
 
@@ -895,7 +895,7 @@ vidtv_psi_pat_program_init(struct vidtv_psi_table_pat_program *head,
 	struct vidtv_psi_table_pat_program *program;
 	const u16 RESERVED = 0x07;
 
-	program = kzalloc(sizeof(*program), GFP_KERNEL);
+	program = kzalloc_obj(*program, GFP_KERNEL);
 	if (!program)
 		return NULL;
 
@@ -967,7 +967,7 @@ struct vidtv_psi_table_pat *vidtv_psi_pat_table_init(u16 transport_stream_id)
 	const u16 ZERO = 0x0;
 	const u16 ONES = 0x03;
 
-	pat = kzalloc(sizeof(*pat), GFP_KERNEL);
+	pat = kzalloc_obj(*pat, GFP_KERNEL);
 	if (!pat)
 		return NULL;
 
@@ -1067,7 +1067,7 @@ vidtv_psi_pmt_stream_init(struct vidtv_psi_table_pmt_stream *head,
 	const u16 ZERO = 0x0;
 	u16 desc_loop_len;
 
-	stream = kzalloc(sizeof(*stream), GFP_KERNEL);
+	stream = kzalloc_obj(*stream, GFP_KERNEL);
 	if (!stream)
 		return NULL;
 
@@ -1153,7 +1153,7 @@ struct vidtv_psi_table_pmt *vidtv_psi_pmt_table_init(u16 program_number,
 	const u16 ZERO = 0x0;
 	u16 desc_loop_len;
 
-	pmt = kzalloc(sizeof(*pmt), GFP_KERNEL);
+	pmt = kzalloc_obj(*pmt, GFP_KERNEL);
 	if (!pmt)
 		return NULL;
 
@@ -1298,7 +1298,7 @@ struct vidtv_psi_table_sdt *vidtv_psi_sdt_table_init(u16 network_id,
 	const u16 ONES = 0x03;
 	const u16 ONE = 0x1;
 
-	sdt  = kzalloc(sizeof(*sdt), GFP_KERNEL);
+	sdt = kzalloc_obj(*sdt, GFP_KERNEL);
 	if (!sdt)
 		return NULL;
 
@@ -1438,7 +1438,7 @@ struct vidtv_psi_table_sdt_service
 {
 	struct vidtv_psi_table_sdt_service *service;
 
-	service = kzalloc(sizeof(*service), GFP_KERNEL);
+	service = kzalloc_obj(*service, GFP_KERNEL);
 	if (!service)
 		return NULL;
 
@@ -1523,9 +1523,8 @@ vidtv_psi_pmt_create_sec_for_each_pat_entry(struct vidtv_psi_table_pat *pat,
 		program = program->next;
 	}
 
-	pmt_secs = kcalloc(num_pmt,
-			   sizeof(struct vidtv_psi_table_pmt *),
-			   GFP_KERNEL);
+	pmt_secs = kzalloc_objs(struct vidtv_psi_table_pmt *, num_pmt,
+				GFP_KERNEL);
 	if (!pmt_secs)
 		return NULL;
 
@@ -1622,11 +1621,11 @@ struct vidtv_psi_table_nit
 	const u16 ONES = 0x03;
 	const u16 ONE = 0x1;
 
-	nit = kzalloc(sizeof(*nit), GFP_KERNEL);
+	nit = kzalloc_obj(*nit, GFP_KERNEL);
 	if (!nit)
 		return NULL;
 
-	transport = kzalloc(sizeof(*transport), GFP_KERNEL);
+	transport = kzalloc_obj(*transport, GFP_KERNEL);
 	if (!transport)
 		goto free_nit;
 
@@ -1857,7 +1856,7 @@ struct vidtv_psi_table_eit
 	const u16 ONE = 0x1;
 	const u16 ONES = 0x03;
 
-	eit = kzalloc(sizeof(*eit), GFP_KERNEL);
+	eit = kzalloc_obj(*eit, GFP_KERNEL);
 	if (!eit)
 		return NULL;
 
@@ -1982,7 +1981,7 @@ struct vidtv_psi_table_eit_event
 	int mjd, l;
 	__be16 mjd_be;
 
-	e = kzalloc(sizeof(*e), GFP_KERNEL);
+	e = kzalloc_obj(*e, GFP_KERNEL);
 	if (!e)
 		return NULL;
 
diff --git a/drivers/media/test-drivers/vidtv/vidtv_s302m.c b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
index 9da18eac04b5..1a2ffcf0796f 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_s302m.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_s302m.c
@@ -148,7 +148,7 @@ static struct vidtv_access_unit *vidtv_s302m_access_unit_init(struct vidtv_acces
 {
 	struct vidtv_access_unit *au;
 
-	au = kzalloc(sizeof(*au), GFP_KERNEL);
+	au = kzalloc_obj(*au, GFP_KERNEL);
 	if (!au)
 		return NULL;
 
@@ -445,7 +445,7 @@ struct vidtv_encoder
 	struct vidtv_s302m_ctx *ctx;
 	struct vidtv_encoder *e;
 
-	e = kzalloc(sizeof(*e), GFP_KERNEL);
+	e = kzalloc_obj(*e, GFP_KERNEL);
 	if (!e)
 		return NULL;
 
diff --git a/drivers/media/test-drivers/vidtv/vidtv_tuner.c b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
index 4ba302d569d6..735eb3b6824d 100644
--- a/drivers/media/test-drivers/vidtv/vidtv_tuner.c
+++ b/drivers/media/test-drivers/vidtv/vidtv_tuner.c
@@ -396,7 +396,7 @@ static int vidtv_tuner_i2c_probe(struct i2c_client *client)
 	struct dvb_frontend *fe           = config->fe;
 	struct vidtv_tuner_dev *tuner_dev = NULL;
 
-	tuner_dev = kzalloc(sizeof(*tuner_dev), GFP_KERNEL);
+	tuner_dev = kzalloc_obj(*tuner_dev, GFP_KERNEL);
 	if (!tuner_dev)
 		return -ENOMEM;
 
diff --git a/drivers/media/test-drivers/vim2m.c b/drivers/media/test-drivers/vim2m.c
index c33c18ea5210..ae091cb67794 100644
--- a/drivers/media/test-drivers/vim2m.c
+++ b/drivers/media/test-drivers/vim2m.c
@@ -1365,7 +1365,7 @@ static int vim2m_open(struct file *file)
 
 	if (mutex_lock_interruptible(&dev->dev_mutex))
 		return -ERESTARTSYS;
-	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+	ctx = kzalloc_obj(*ctx, GFP_KERNEL);
 	if (!ctx) {
 		rc = -ENOMEM;
 		goto open_unlock;
@@ -1492,7 +1492,7 @@ static int vim2m_probe(struct platform_device *pdev)
 	struct video_device *vfd;
 	int ret;
 
-	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+	dev = kzalloc_obj(*dev, GFP_KERNEL);
 	if (!dev)
 		return -ENOMEM;
 
diff --git a/drivers/media/test-drivers/vimc/vimc-capture.c b/drivers/media/test-drivers/vimc/vimc-capture.c
index 7f6124025fc9..e8a91f78a484 100644
--- a/drivers/media/test-drivers/vimc/vimc-capture.c
+++ b/drivers/media/test-drivers/vimc/vimc-capture.c
@@ -397,7 +397,7 @@ static struct vimc_ent_device *vimc_capture_add(struct vimc_device *vimc,
 	int ret;
 
 	/* Allocate the vimc_capture_device struct */
-	vcapture = kzalloc(sizeof(*vcapture), GFP_KERNEL);
+	vcapture = kzalloc_obj(*vcapture, GFP_KERNEL);
 	if (!vcapture)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/media/test-drivers/vimc/vimc-core.c b/drivers/media/test-drivers/vimc/vimc-core.c
index f632c77e52f5..7267766662fa 100644
--- a/drivers/media/test-drivers/vimc/vimc-core.c
+++ b/drivers/media/test-drivers/vimc/vimc-core.c
@@ -287,8 +287,8 @@ static int vimc_register_devices(struct vimc_device *vimc)
 		return ret;
 	}
 	/* allocate ent_devs */
-	vimc->ent_devs = kcalloc(vimc->pipe_cfg->num_ents,
-				 sizeof(*vimc->ent_devs), GFP_KERNEL);
+	vimc->ent_devs = kzalloc_objs(*vimc->ent_devs, vimc->pipe_cfg->num_ents,
+				      GFP_KERNEL);
 	if (!vimc->ent_devs) {
 		ret = -ENOMEM;
 		goto err_v4l2_unregister;
@@ -354,7 +354,7 @@ static int vimc_probe(struct platform_device *pdev)
 	if (vimc_allocator == VIMC_ALLOCATOR_DMA_CONTIG)
 		dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
 
-	vimc = kzalloc(sizeof(*vimc), GFP_KERNEL);
+	vimc = kzalloc_obj(*vimc, GFP_KERNEL);
 	if (!vimc)
 		return -ENOMEM;
 
diff --git a/drivers/media/test-drivers/vimc/vimc-debayer.c b/drivers/media/test-drivers/vimc/vimc-debayer.c
index bbb7c7a86df0..9f86944a04a5 100644
--- a/drivers/media/test-drivers/vimc/vimc-debayer.c
+++ b/drivers/media/test-drivers/vimc/vimc-debayer.c
@@ -564,7 +564,7 @@ static struct vimc_ent_device *vimc_debayer_add(struct vimc_device *vimc,
 	int ret;
 
 	/* Allocate the vdebayer struct */
-	vdebayer = kzalloc(sizeof(*vdebayer), GFP_KERNEL);
+	vdebayer = kzalloc_obj(*vdebayer, GFP_KERNEL);
 	if (!vdebayer)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/media/test-drivers/vimc/vimc-lens.c b/drivers/media/test-drivers/vimc/vimc-lens.c
index 96399057a2b5..9b7909ded8d6 100644
--- a/drivers/media/test-drivers/vimc/vimc-lens.c
+++ b/drivers/media/test-drivers/vimc/vimc-lens.c
@@ -54,7 +54,7 @@ static struct vimc_ent_device *vimc_lens_add(struct vimc_device *vimc,
 	int ret;
 
 	/* Allocate the vlens struct */
-	vlens = kzalloc(sizeof(*vlens), GFP_KERNEL);
+	vlens = kzalloc_obj(*vlens, GFP_KERNEL);
 	if (!vlens)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/media/test-drivers/vimc/vimc-scaler.c b/drivers/media/test-drivers/vimc/vimc-scaler.c
index 47d0d63865a0..eb0a45944e4f 100644
--- a/drivers/media/test-drivers/vimc/vimc-scaler.c
+++ b/drivers/media/test-drivers/vimc/vimc-scaler.c
@@ -392,7 +392,7 @@ static struct vimc_ent_device *vimc_scaler_add(struct vimc_device *vimc,
 	int ret;
 
 	/* Allocate the vscaler struct */
-	vscaler = kzalloc(sizeof(*vscaler), GFP_KERNEL);
+	vscaler = kzalloc_obj(*vscaler, GFP_KERNEL);
 	if (!vscaler)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/media/test-drivers/vimc/vimc-sensor.c b/drivers/media/test-drivers/vimc/vimc-sensor.c
index 027767777763..e53d28e59ac3 100644
--- a/drivers/media/test-drivers/vimc/vimc-sensor.c
+++ b/drivers/media/test-drivers/vimc/vimc-sensor.c
@@ -382,7 +382,7 @@ static struct vimc_ent_device *vimc_sensor_add(struct vimc_device *vimc,
 	int ret;
 
 	/* Allocate the vsensor struct */
-	vsensor = kzalloc(sizeof(*vsensor), GFP_KERNEL);
+	vsensor = kzalloc_obj(*vsensor, GFP_KERNEL);
 	if (!vsensor)
 		return ERR_PTR(-ENOMEM);
 
diff --git a/drivers/media/test-drivers/visl/visl-core.c b/drivers/media/test-drivers/visl/visl-core.c
index 26c6c6835f79..5ef662fa6cfa 100644
--- a/drivers/media/test-drivers/visl/visl-core.c
+++ b/drivers/media/test-drivers/visl/visl-core.c
@@ -332,7 +332,7 @@ static int visl_open(struct file *file)
 
 	if (mutex_lock_interruptible(&dev->dev_mutex))
 		return -ERESTARTSYS;
-	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
+	ctx = kzalloc_obj(*ctx, GFP_KERNEL);
 	if (!ctx) {
 		rc = -ENOMEM;
 		goto unlock;
@@ -437,7 +437,7 @@ static int visl_probe(struct platform_device *pdev)
 	int ret;
 	int rc;
 
-	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+	dev = kzalloc_obj(*dev, GFP_KERNEL);
 	if (!dev)
 		return -ENOMEM;
 
diff --git a/drivers/media/test-drivers/visl/visl-debugfs.c b/drivers/media/test-drivers/visl/visl-debugfs.c
index 45f2a8268014..8cb75c63aca6 100644
--- a/drivers/media/test-drivers/visl/visl-debugfs.c
+++ b/drivers/media/test-drivers/visl/visl-debugfs.c
@@ -45,7 +45,7 @@ void visl_trace_bitstream(struct visl_ctx *ctx, struct visl_run *run)
 	struct dentry *dentry;
 	char name[32];
 
-	blob  = kzalloc(sizeof(*blob), GFP_KERNEL);
+	blob = kzalloc_obj(*blob, GFP_KERNEL);
 	if (!blob)
 		return;
 
diff --git a/drivers/media/test-drivers/vivid/vivid-core.c b/drivers/media/test-drivers/vivid/vivid-core.c
index 9c0b1a32b5c9..5d73701f9080 100644
--- a/drivers/media/test-drivers/vivid/vivid-core.c
+++ b/drivers/media/test-drivers/vivid/vivid-core.c
@@ -1814,7 +1814,7 @@ static int vivid_create_instance(struct platform_device *pdev, int inst)
 	int i;
 
 	/* allocate main vivid state structure */
-	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+	dev = kzalloc_obj(*dev, GFP_KERNEL);
 	if (!dev)
 		return -ENOMEM;