diff options
| author | Thomas Meyer <thomas@m3y3r.de> | 2011-11-29 15:08:00 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-30 14:22:17 -0500 |
| commit | 9884d7bea756a4657c6a5d20249bffadc460e140 (patch) | |
| tree | 56c2c8c46c2c812aad3cf7ec2ab50cbec5ae3e47 | |
| parent | d0d97488dd1e8131ac9d8f7d3487c355f4bf9d72 (diff) | |
[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: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/media/video/stk-webcam.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/v4l2-ctrls.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c index cbc105f975de..dba2317ba5b9 100644 --- a/drivers/media/video/stk-webcam.c +++ b/drivers/media/video/stk-webcam.c | |||
| @@ -377,8 +377,8 @@ static int stk_prepare_iso(struct stk_camera *dev) | |||
| 377 | if (dev->isobufs) | 377 | if (dev->isobufs) |
| 378 | STK_ERROR("isobufs already allocated. Bad\n"); | 378 | STK_ERROR("isobufs already allocated. Bad\n"); |
| 379 | else | 379 | else |
| 380 | dev->isobufs = kzalloc(MAX_ISO_BUFS * sizeof(*dev->isobufs), | 380 | dev->isobufs = kcalloc(MAX_ISO_BUFS, sizeof(*dev->isobufs), |
| 381 | GFP_KERNEL); | 381 | GFP_KERNEL); |
| 382 | if (dev->isobufs == NULL) { | 382 | if (dev->isobufs == NULL) { |
| 383 | STK_ERROR("Unable to allocate iso buffers\n"); | 383 | STK_ERROR("Unable to allocate iso buffers\n"); |
| 384 | return -ENOMEM; | 384 | return -ENOMEM; |
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c index 39266153499f..da1f4c2d2d4b 100644 --- a/drivers/media/video/v4l2-ctrls.c +++ b/drivers/media/video/v4l2-ctrls.c | |||
| @@ -1109,8 +1109,8 @@ int v4l2_ctrl_handler_init(struct v4l2_ctrl_handler *hdl, | |||
| 1109 | INIT_LIST_HEAD(&hdl->ctrls); | 1109 | INIT_LIST_HEAD(&hdl->ctrls); |
| 1110 | INIT_LIST_HEAD(&hdl->ctrl_refs); | 1110 | INIT_LIST_HEAD(&hdl->ctrl_refs); |
| 1111 | hdl->nr_of_buckets = 1 + nr_of_controls_hint / 8; | 1111 | hdl->nr_of_buckets = 1 + nr_of_controls_hint / 8; |
| 1112 | hdl->buckets = kzalloc(sizeof(hdl->buckets[0]) * hdl->nr_of_buckets, | 1112 | hdl->buckets = kcalloc(hdl->nr_of_buckets, sizeof(hdl->buckets[0]), |
| 1113 | GFP_KERNEL); | 1113 | GFP_KERNEL); |
| 1114 | hdl->error = hdl->buckets ? 0 : -ENOMEM; | 1114 | hdl->error = hdl->buckets ? 0 : -ENOMEM; |
| 1115 | return hdl->error; | 1115 | return hdl->error; |
| 1116 | } | 1116 | } |