From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Fri, 13 Jan 2017 09:48:08 +0000 Subject: [PATCH 1/3] sh/intc: Use kcalloc() in register_intc_controller() Message-Id: <6f6f99f6-26f0-d002-ca85-d974d71aa518@users.sourceforge.net> List-Id: References: <4d37c4d8-d28b-bd98-968b-f544d6a213eb@users.sourceforge.net> In-Reply-To: <4d37c4d8-d28b-bd98-968b-f544d6a213eb@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-sh@vger.kernel.org, Rich Felker , Yoshinori Sato Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Fri, 13 Jan 2017 10:04:38 +0100 Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus use the corresponding function "kcalloc". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/sh/intc/core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c index 8e72bcbd3d6d..27817a8466f1 100644 --- a/drivers/sh/intc/core.c +++ b/drivers/sh/intc/core.c @@ -203,7 +203,8 @@ int __init register_intc_controller(struct intc_desc *desc) if (desc->num_resources) { d->nr_windows = desc->num_resources; - d->window = kzalloc(d->nr_windows * sizeof(*d->window), + d->window = kcalloc(d->nr_windows, + sizeof(*d->window), GFP_NOWAIT); if (!d->window) goto err1; @@ -229,13 +230,12 @@ int __init register_intc_controller(struct intc_desc *desc) d->nr_reg += hw->sense_regs ? hw->nr_sense_regs : 0; d->nr_reg += hw->ack_regs ? hw->nr_ack_regs : 0; d->nr_reg += hw->subgroups ? hw->nr_subgroups : 0; - - d->reg = kzalloc(d->nr_reg * sizeof(*d->reg), GFP_NOWAIT); + d->reg = kcalloc(d->nr_reg, sizeof(*d->reg), GFP_NOWAIT); if (!d->reg) goto err2; #ifdef CONFIG_SMP - d->smp = kzalloc(d->nr_reg * sizeof(*d->smp), GFP_NOWAIT); + d->smp = kcalloc(d->nr_reg, sizeof(*d->smp), GFP_NOWAIT); if (!d->smp) goto err3; #endif @@ -253,7 +253,8 @@ int __init register_intc_controller(struct intc_desc *desc) } if (hw->prio_regs) { - d->prio = kzalloc(hw->nr_vectors * sizeof(*d->prio), + d->prio = kcalloc(hw->nr_vectors, + sizeof(*d->prio), GFP_NOWAIT); if (!d->prio) goto err4; @@ -269,7 +270,8 @@ int __init register_intc_controller(struct intc_desc *desc) } if (hw->sense_regs) { - d->sense = kzalloc(hw->nr_vectors * sizeof(*d->sense), + d->sense = kcalloc(hw->nr_vectors, + sizeof(*d->sense), GFP_NOWAIT); if (!d->sense) goto err5; -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751400AbdAMJs3 (ORCPT ); Fri, 13 Jan 2017 04:48:29 -0500 Received: from mout.web.de ([217.72.192.78]:49731 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751282AbdAMJs0 (ORCPT ); Fri, 13 Jan 2017 04:48:26 -0500 Subject: [PATCH 1/3] sh/intc: Use kcalloc() in register_intc_controller() To: linux-sh@vger.kernel.org, Rich Felker , Yoshinori Sato References: <4d37c4d8-d28b-bd98-968b-f544d6a213eb@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <6f6f99f6-26f0-d002-ca85-d974d71aa518@users.sourceforge.net> Date: Fri, 13 Jan 2017 10:48:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <4d37c4d8-d28b-bd98-968b-f544d6a213eb@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:3N3Oi5I/t4B1Kl4b+Qr8cOc+Tuuj8zsx+2KFMDATQMeA/gVZkaf xe09p3WmN24f4roCdmLYJPtOkKmD4REGCSr0s6+mJYFt2w2ov/BZT3qddjLckxpegfx+55y EbJkZuWeOIfeP8Nwh6LhJ6jvw0m31Z0g67ElMzGIYW5bDfDB7vkhqvjV43N0T9mJ5ip65cB Ut0RAoBykebLzOvK3tycw== X-UI-Out-Filterresults: notjunk:1;V01:K0:kk2Jwu4Bk+M=:cef8JA5vzatc5nNAMIRaep unwieLCMinNYl1xUIjKjf+l8PO9DvK7byNdPuAd2vNrZemZx495O05HYyfjnpSRzNORHDvxAk sDn3QF9W3a+g5HcmP9k5iIohJfpcWOP+YtUTWf5cY53ziYd6sQfaNpXSi8hFKWK+HkERjfz/x lREUdC1RH/lMrz7fYGiuN7OdZ/ueB8Y/X9m17HXkOZ0TQaWIH1uVmX+t/GlpFFSjNG/DBd4R4 yYsgeVn9BbUwhDC1pdPp0bhYVmjda0bk2fH/GWu6U8kEwwav0bmbLWXzafCTyV61JgBBoNLcw ry5c/K27iGkFVrgwh73S/PvTYJ12fIt1zsNzIgUpvVKOzhq42RooPQtS6iyZM5N/IAMOIaTqI fXO9NjZ7q+o1e6Fy8jMSaQUna6Ce2dSH1pXCN0Wa7OdMLWhQJ8e+/kM8w+POIVs+K1BJtb9TT qhko/LtBI26ZQcuWpW9KDZaxjzLGbXdmZ7vI5WCpoo+8jvPJWqXU1MQnwIig9lP8XV9Mcjg46 6d5vE/1u3laY6uzChaZE9bx4xbsX077+P5snRdDF/pzb+vppDn1r6sWzeVJqkiDcok1Cr6HqV ggC1PW4PR1uvT+Z16OA+xenK8/BFLReAs4ZK/nueRV16O3d74zdE73pmqWNq1lrZxNaVhrG+3 fUSvIa6Xf4qMR68i45EqFIvTwYZ9d+4BusRz5T/lX55ioazR26jVT+zYJCd8eUp4KJ4rkvx4J nodchiLl49VRDC8mLc/mVIQ4Gc2/VZe5s1ASop1YkCCXignUXyXDWm9T+Nuqh9vPZ0mEzTyCf BUkb7rE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 13 Jan 2017 10:04:38 +0100 Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus use the corresponding function "kcalloc". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/sh/intc/core.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c index 8e72bcbd3d6d..27817a8466f1 100644 --- a/drivers/sh/intc/core.c +++ b/drivers/sh/intc/core.c @@ -203,7 +203,8 @@ int __init register_intc_controller(struct intc_desc *desc) if (desc->num_resources) { d->nr_windows = desc->num_resources; - d->window = kzalloc(d->nr_windows * sizeof(*d->window), + d->window = kcalloc(d->nr_windows, + sizeof(*d->window), GFP_NOWAIT); if (!d->window) goto err1; @@ -229,13 +230,12 @@ int __init register_intc_controller(struct intc_desc *desc) d->nr_reg += hw->sense_regs ? hw->nr_sense_regs : 0; d->nr_reg += hw->ack_regs ? hw->nr_ack_regs : 0; d->nr_reg += hw->subgroups ? hw->nr_subgroups : 0; - - d->reg = kzalloc(d->nr_reg * sizeof(*d->reg), GFP_NOWAIT); + d->reg = kcalloc(d->nr_reg, sizeof(*d->reg), GFP_NOWAIT); if (!d->reg) goto err2; #ifdef CONFIG_SMP - d->smp = kzalloc(d->nr_reg * sizeof(*d->smp), GFP_NOWAIT); + d->smp = kcalloc(d->nr_reg, sizeof(*d->smp), GFP_NOWAIT); if (!d->smp) goto err3; #endif @@ -253,7 +253,8 @@ int __init register_intc_controller(struct intc_desc *desc) } if (hw->prio_regs) { - d->prio = kzalloc(hw->nr_vectors * sizeof(*d->prio), + d->prio = kcalloc(hw->nr_vectors, + sizeof(*d->prio), GFP_NOWAIT); if (!d->prio) goto err4; @@ -269,7 +270,8 @@ int __init register_intc_controller(struct intc_desc *desc) } if (hw->sense_regs) { - d->sense = kzalloc(hw->nr_vectors * sizeof(*d->sense), + d->sense = kcalloc(hw->nr_vectors, + sizeof(*d->sense), GFP_NOWAIT); if (!d->sense) goto err5; -- 2.11.0