From patchwork Sun Aug 28 17:16:17 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: 663393 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sMhMn070nz9s4n for ; Mon, 29 Aug 2016 03:19:01 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sMhMm6P2wzDrff for ; Mon, 29 Aug 2016 03:19:00 +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.17.12]) (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 3sMhK52K7PzDrff for ; Mon, 29 Aug 2016 03:16:40 +1000 (AEST) Received: from [192.168.1.3] ([77.181.152.74]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0LetUp-1bKgF33cHX-00qlfC; Sun, 28 Aug 2016 19:16:19 +0200 Subject: [PATCH 4/6] KVM: PPC: e500: Replace kzalloc() calls by kcalloc() in two functions To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Alexander Graf , Benjamin Herrenschmidt , Michael Ellerman , Paolo Bonzini , Paul Mackerras , =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= References: <566ABCD9.1060404@users.sourceforge.net> From: SF Markus Elfring Message-ID: Date: Sun, 28 Aug 2016 19:16:17 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: X-Provags-ID: V03:K0:ZsHLZC97zde4zPPomyocRaDleGUIZgDjeLO25iHlnm+2P0st72D zCa/zIH7qatKyLRN0REj+djD7bIpgFkKsZCyJs0X4IN9B35iN2UVwRZzgo/PWNaTNTqBPkO HkDpn1hkOZwVeGqK/IlDIa0bgvUF+aLBzym1m0QaEUE+gsrhAmZmWhgTtFRIdKhBzEutOJU MbEYaJsLpG2/9oE6yD5GQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:xBKVJed3wy0=:QmtT/j30tLiYMafHenXT1R 45vbcXJtV27cPFvhRGbV9CpdKDPJ9GsjPhUEJrBP+J9BEFqGoBQuWdnnrAfxDbfs/6wHDH6jo dh2/MNXgp2zCtQwR38OlnsFM5+DylpBzGFwLxOY5Zrd6B33uYaq4sxcykQ3aJQ7ehkvYBIhIZ M4d4Dyt8Q8cafCqlMUwcr60CZCpVd1Nj1VJhudl9Y32y7r9LUClAumLOPDcMbmZOJbcr+SarJ /kmtZs6pj5HfeXdBdSDPta89KVOnGlG3Tvq877SAI5qBiAi7aGT5CtgOQBzUIgB77u6ORbsuK MEhne+GES98AWsqY58sob+UKfoS+mDcEXNxNQQw2ZNLhbJDgvjUgTnJ4rilaEE/Hm5cADgJi8 T5DWy5+JNedYOCuhTHgYzjy7r/BGlcBauPDQxN7MlwFf4xgH5kAE/X6rOcgnvvId/jjMlFtdn F3XWHX0a6OhRnzrkwL+Hv6BJBxfdu0YQv86b8Q+zqvaOITTaMf+iuzC4Bf7Dlxnsqg7bRRFx0 Xm7X8hrNKko5uPodFrS+ST7nTfbrH0Xw1/6uTcS4ryUZ5BTIEQ+8cbUNLPHmQ1oxBQY8pWs38 ths/oPNzLk6fGIN2lfNsnakHA59CdQLBhsMkBgGH/gMlqC9b7Ssw5b6PEltvHyU1LutS233LL gxwqu4GYtxEL5urR6FAJ4/vr/f13SFaueaqIoSz2xrFPTA0XsgwgrG0vJizHPO9QL0Vbr/jXx vYc60ceaec0+7Vc5kGxr39SITQ1jdoHGxoj5l/H39EqvVvR68tzJNel243iPvsswl/zf9vRp2 DS2jgqy 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 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Sun, 28 Aug 2016 18:30:38 +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 "kcalloc". Suggested-by: Paolo Bonzini This issue was detected also by using the Coccinelle software. * Replace the specification of data structures by pointer dereferences to make the corresponding size determination a bit safer according to the Linux coding style convention. Signed-off-by: Markus Elfring --- arch/powerpc/kvm/e500_mmu.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/kvm/e500_mmu.c b/arch/powerpc/kvm/e500_mmu.c index e9c19e9..2be2afc4 100644 --- a/arch/powerpc/kvm/e500_mmu.c +++ b/arch/powerpc/kvm/e500_mmu.c @@ -799,22 +799,21 @@ int kvm_vcpu_ioctl_config_tlb(struct kvm_vcpu *vcpu, goto put_pages; } - privs[0] = kzalloc(sizeof(struct tlbe_priv) * params.tlb_sizes[0], - GFP_KERNEL); + privs[0] = kcalloc(params.tlb_sizes[0], sizeof(*privs[0]), GFP_KERNEL); if (!privs[0]) { ret = -ENOMEM; goto put_pages; } - privs[1] = kzalloc(sizeof(struct tlbe_priv) * params.tlb_sizes[1], - GFP_KERNEL); + privs[1] = kcalloc(params.tlb_sizes[1], sizeof(*privs[1]), GFP_KERNEL); if (!privs[1]) { ret = -ENOMEM; goto free_privs_first; } - g2h_bitmap = kzalloc(sizeof(u64) * params.tlb_sizes[1], - GFP_KERNEL); + g2h_bitmap = kcalloc(params.tlb_sizes[1], + sizeof(*g2h_bitmap), + GFP_KERNEL); if (!g2h_bitmap) { ret = -ENOMEM; goto free_privs_second; @@ -929,20 +928,20 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) vcpu_e500->gtlb_offset[0] = 0; vcpu_e500->gtlb_offset[1] = KVM_E500_TLB0_SIZE; - vcpu_e500->gtlb_priv[0] = kzalloc(sizeof(struct tlbe_ref) * - vcpu_e500->gtlb_params[0].entries, + vcpu_e500->gtlb_priv[0] = kcalloc(vcpu_e500->gtlb_params[0].entries, + sizeof(struct tlbe_ref), GFP_KERNEL); if (!vcpu_e500->gtlb_priv[0]) goto err; - vcpu_e500->gtlb_priv[1] = kzalloc(sizeof(struct tlbe_ref) * - vcpu_e500->gtlb_params[1].entries, + vcpu_e500->gtlb_priv[1] = kcalloc(vcpu_e500->gtlb_params[1].entries, + sizeof(struct tlbe_ref), GFP_KERNEL); if (!vcpu_e500->gtlb_priv[1]) goto err; - vcpu_e500->g2h_tlb1_map = kzalloc(sizeof(u64) * - vcpu_e500->gtlb_params[1].entries, + vcpu_e500->g2h_tlb1_map = kcalloc(vcpu_e500->gtlb_params[1].entries, + sizeof(*vcpu_e500->g2h_tlb1_map), GFP_KERNEL); if (!vcpu_e500->g2h_tlb1_map) goto err;