Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e79c70e6 authored by Thomas Meyer's avatar Thomas Meyer Committed by Mauro Carvalho Chehab
Browse files

[media] pvrusb2: Use kcalloc instead of kzalloc to allocate array 

The advantage of kcalloc is, that will prevent integer overflows which could
result from the multiplication of number of elements and size and it is also
a bit nicer to read.

The semantic patch that makes this change is available
in https://lkml.org/lkml/2011/11/25/107



Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Acked-By: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 56a8b9f1

drivers/media/video/pvrusb2/pvrusb2-hdw.c

+3 −2
Original line number Diff line number Diff line
@@ -2546,8 +2546,9 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, 
	}



	/* Define and configure additional controls from cx2341x module. */

	hdw->mpeg_ctrl_info = kzalloc(

		sizeof(*(hdw->mpeg_ctrl_info)) * MPEGDEF_COUNT, GFP_KERNEL);

	hdw->mpeg_ctrl_info = kcalloc(MPEGDEF_COUNT,

				      sizeof(*(hdw->mpeg_ctrl_info)),

				      GFP_KERNEL);

	if (!hdw->mpeg_ctrl_info) goto fail;

	for (idx = 0; idx < MPEGDEF_COUNT; idx++) {

		cptr = hdw->controls + idx + CTRLDEF_COUNT;