From 8f20cc44fce0188409867d76fe5cd6008cce2175 Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Mon, 26 Dec 2016 15:14:33 -0200 Subject: [PATCH] UPSTREAM: [media] v4l2-async: Use kmalloc_array() in v4l2_async_notifier_unregister() A multiplication for the size determination of a memory allocation indicated that an array data structure should be processed. Thus use the corresponding function "kmalloc_array". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring Acked-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab (cherry picked from commit f9e9c0669f15919a0e5e2908369eb6406af95ca0) from media/v4.11-1 BUG=b:62359918 TEST=No regression in camera functionality TEST=Kernel builds and boots Change-Id: I8e44b3a2a1eb8538fa05378cc28dab10fc734984 Signed-off-by: Nathan Ciobanu Reviewed-on: https://chromium-review.googlesource.com/528601 Commit-Ready: Nathan D Ciobanu Tested-by: Yong Zhi Reviewed-by: Tomasz Figa Signed-off-by: Jacob Chen --- drivers/media/v4l2-core/v4l2-async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c index 5bada202b2d3..277183f2d514 100644 --- a/drivers/media/v4l2-core/v4l2-async.c +++ b/drivers/media/v4l2-core/v4l2-async.c @@ -202,7 +202,7 @@ void v4l2_async_notifier_unregister(struct v4l2_async_notifier *notifier) if (!notifier->v4l2_dev) return; - dev = kmalloc(n_subdev * sizeof(*dev), GFP_KERNEL); + dev = kmalloc_array(n_subdev, sizeof(*dev), GFP_KERNEL); if (!dev) { dev_err(notifier->v4l2_dev->dev, "Failed to allocate device cache!\n");