[PATCH] perf/x86: Use kmalloc_array() in merge_attr()

From: SF Markus Elfring
Date: Sun Sep 04 2016 - 05:02:57 EST


From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Sun, 4 Sep 2016 10:45:20 +0200

* 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.

* Replace the specification of a data structure by a pointer dereference
to make the corresponding size determination a bit safer according to
the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
arch/x86/events/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c
index 18a1acf..f7f3578 100644
--- a/arch/x86/events/core.c
+++ b/arch/x86/events/core.c
@@ -1618,7 +1618,7 @@ __init struct attribute **merge_attr(struct attribute **a, struct attribute **b)
j++;
j++;

- new = kmalloc(sizeof(struct attribute *) * j, GFP_KERNEL);
+ new = kmalloc_array(j, sizeof(*new), GFP_KERNEL);
if (!new)
return NULL;

--
2.9.3