From patchwork Wed Aug 24 20:36:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 662511 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sKK0s2jVTz9sCj for ; Thu, 25 Aug 2016 06:39:25 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sKK0s1r8lzDrdN for ; Thu, 25 Aug 2016 06:39:25 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.web.de (mout.web.de [212.227.15.3]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sKJzm3XcCzDrcb for ; Thu, 25 Aug 2016 06:38:28 +1000 (AEST) Received: from [192.168.1.3] ([77.181.181.129]) by smtp.web.de (mrweb002) with ESMTPSA (Nemesis) id 0MGANT-1bO8Jo1IGN-00F7wK; Wed, 24 Aug 2016 22:36:59 +0200 To: linuxppc-dev@lists.ozlabs.org, Alexey Kardashevskiy , Alistair Popple , Benjamin Herrenschmidt , Gavin Shan , Ian Munsie , Michael Ellerman , Paul Mackerras , Wei Yang From: SF Markus Elfring Subject: [PATCH] powerpc/powernv/pci: Use kmalloc_array() in two functions Message-ID: <817567b2-cdf6-7f7b-6041-9a026ea10a0f@users.sourceforge.net> Date: Wed, 24 Aug 2016 22:36:54 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 X-Provags-ID: V03:K0:D6uN2+nP1dHi7XQSvn//0CmkeC4ezARWTRAcp9yKlzV8Ki40HHV MYVzN+ui7z8f+eMI2oDfhRxhGAZj/H41VGg4sQMMVKLGXq3E1xgTdiSNlkXaj8jcqRLi0Wv 5eA0Ia62SyAL7+VtU6Rzv4lmnlGjflU0LIHHOnknYtiaJTKTpyOALgYkc14paMwHCwn4Lsm LzyTAwIVrCOA13YN+2Zkw== X-UI-Out-Filterresults: notjunk:1; V01:K0:UD6NHBmItIA=:os690ugdiYfHRaQAUFIRhR AKjhRa6EvJYzeM5ZyqNFPZ1XfTK9ii2wE6BmTPBbnCHhq6bC6L6lfmHH3AwKRlqZFKAz8uk2T H0T+7Z3vFdHW1luT1ov/ShLjQsAo9qPORhw2ghEnZ1WcxiuF246dlzUBuOyW6iiLx7/u3y7rm QtMsAd3SDS1zFnW4tIWTL5uqeI7fBNAbz3Mp1f/C4ZXeH2RGcJaPvnNDmZJhDQjkCvcBXxH2N 8qv/Y7IUODZ02T4c8xADJKjSxeEnedQlDlysEP7MiQPi7Qbw0DXl9uCvLOpw6y7OIO5AuPCAo 4gPe+u5FWUizOJoexxLCkmIvsrUj+SrOfyUxN60QWBhiEbF7RgD0QZdxT4gTB0H7yvnBJ+cor rt/s6SFX+nxCHgFSvuye1s2uxqR/KnJeBBGkCIzvD+0wQas7mJ/YoAA6MHAKTZlBSRykeKI7h Hc14LjTrkaGSWGQCJp2+b1Ea8BNhSyi85de7DpRqmh1E3skLYm9xXElyaIRcE/jeuB8Is8VXj bVof/aP2fV+pFlQ5QJqnpFmQEVXjKLiFajZVA4XRoZnXLlL/0C2U7YlLAocmjC1TnpPpKf8Gg rRxIkcP/BgnfavI8MKWKaiYmbBCuEJjX+o6IdhYm34irzP2UhVxf4wLEu5OH1RfH86w+2GHqo nLOUsve6kpwwDjtPMySRK2VrnWuKpBne+UWQ92SU+Us8qO5yMihdEUFC4akT5bOH+yLdSDHoW 517ePc1ZohqjcQ/hDtrS5n75fCIEN8lH/p+zu9pI2mVfrudAxcB7OgyMSXHHqj1S/8BMur7bD hjW2/9N X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Julia Lawall , kernel-janitors@vger.kernel.org, LKML , Paolo Bonzini Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Wed, 24 Aug 2016 22:26:37 +0200 A multiplication for the size determination of a memory allocation indicated that an array data structure should be processed. Thus reuse the corresponding function "kmalloc_array". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- arch/powerpc/platforms/powernv/pci-ioda.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index fd9444f..2366552 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1305,7 +1305,9 @@ static int pnv_pci_vf_assign_m64(struct pci_dev *pdev, u16 num_vfs) else m64_bars = 1; - pdn->m64_map = kmalloc(sizeof(*pdn->m64_map) * m64_bars, GFP_KERNEL); + pdn->m64_map = kmalloc_array(m64_bars, + sizeof(*pdn->m64_map), + GFP_KERNEL); if (!pdn->m64_map) return -ENOMEM; /* Initialize the m64_map to IODA_INVALID_M64 */ @@ -1572,8 +1574,9 @@ int pnv_pci_sriov_enable(struct pci_dev *pdev, u16 num_vfs) /* Allocating pe_num_map */ if (pdn->m64_single_mode) - pdn->pe_num_map = kmalloc(sizeof(*pdn->pe_num_map) * num_vfs, - GFP_KERNEL); + pdn->pe_num_map = kmalloc_array(num_vfs, + sizeof(*pdn->pe_num_map), + GFP_KERNEL); else pdn->pe_num_map = kmalloc(sizeof(*pdn->pe_num_map), GFP_KERNEL);