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

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

[media] v4l2-ctrls: 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>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent d0d97488

drivers/media/video/stk-webcam.c

+2 −2
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int stk_prepare_iso(struct stk_camera *dev) 
	if (dev->isobufs)

		STK_ERROR("isobufs already allocated. Bad\n");

	else

		dev->isobufs = kzalloc(MAX_ISO_BUFS * sizeof(*dev->isobufs),

		dev->isobufs = kcalloc(MAX_ISO_BUFS, sizeof(*dev->isobufs),

				       GFP_KERNEL);

	if (dev->isobufs == NULL) {

		STK_ERROR("Unable to allocate iso buffers\n");

drivers/media/video/v4l2-ctrls.c

+2 −2
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ int v4l2_ctrl_handler_init(struct v4l2_ctrl_handler *hdl, 
	INIT_LIST_HEAD(&hdl->ctrls);

	INIT_LIST_HEAD(&hdl->ctrl_refs);

	hdl->nr_of_buckets = 1 + nr_of_controls_hint / 8;

	hdl->buckets = kzalloc(sizeof(hdl->buckets[0]) * hdl->nr_of_buckets,

	hdl->buckets = kcalloc(hdl->nr_of_buckets, sizeof(hdl->buckets[0]),

			       GFP_KERNEL);

	hdl->error = hdl->buckets ? 0 : -ENOMEM;

	return hdl->error;