From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752876AbcIMMML (ORCPT ); Tue, 13 Sep 2016 08:12:11 -0400 Received: from mout.web.de ([212.227.15.4]:60431 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750747AbcIMMMJ (ORCPT ); Tue, 13 Sep 2016 08:12:09 -0400 Subject: [PATCH 1/4] virtio_blk: Use kmalloc_array() in init_vq() To: virtualization@lists.linux-foundation.org, "Michael S. Tsirkin" References: <566ABCD9.1060404@users.sourceforge.net> <02054675-8395-ac81-6863-e3a5cbfc9032@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <7a8dd874-3700-1445-2143-2a604cd043ab@users.sourceforge.net> Date: Tue, 13 Sep 2016 14:12:01 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <02054675-8395-ac81-6863-e3a5cbfc9032@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:p4LJePs0UbhFPn5psygsNeZ0Xk6ldO2BEnYea+kVWkm3HX1wJxR xT9Yp0EeqdgXNIjWyF36cBr3S1R1fv/1QOGDJQ8yC1xn1io98wzxbdkz1xx9PigVjUEiNBC MdbiWMt0Uq1IcVB7yPEKoKSDHX2PFnqBt+TwnKZd0g0rHbgCYB3qgpNCHW5/zuCEdM6LIj5 FBFp59F/8bgYZUSFXAtPQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:em/tSs478EI=:42nHbnZZUUviEECZqugdnf f+I4DpOw7vxbq05ySgh8aYaOG1nfTirUtvv7JtWrzBrXXvnvO3m5QInsq3OaVq1GSXP6g7yv7 zqZA3mTNVkXm10uTGq6/rTG4F3J0T/E18dO43JxZldaeUdXkgiftkdHjr/hwAfSWe6XWfBIE6 KZLtPZd38nXdx3BIcxM2RBfOiKseFH6PhEcq8BWAkOlX/KTxIxZMtFbWZqRD2DoeTMotmgMMs X2ChO5O0a8MDJdjzYNWByvQI781n3dOhxIX7tkOI6/pDEKzH8pTPv13vWwdDrRo3BSZ3vU934 6m5KZg6m4rRBQ58nfZfEdkIlDLp+wiETnHSASomBPeFIEIP5jjfIMGhVnMLE4Cw7M3vhHwbrI w/soFtJ+BjuSDuKY8fuWfJZDvJXNAk9ZIWFsSXIxsrcgNur/1+CBPGTYMUesI4rkmUsDKsOEY s2g9Lss9qMLvHDJgcjqqnYU7uD1hlxPvL7fCiCIkzGIg5O3J3zZLZU8iKrVgBWXEZOU/I9an7 tLWciAjf5CjHraq3ZHSUVGFf2IfAYoBwwMeQJsFY0gklzGb5+vYsc2We8LWW0yY7jTRIHmPrs 7GSID4U+bf720hFoipUR7YVigmMC7zO8eQFEShvPlYbkdloqDbEnTkD3SUZb33kviSi4qJo4m eO2hR70tkAU/lq9zQ9RSylGx2VYkLMl3BjzprHDjf2frK06yRamh0CXT1j5DPy3NlZvH+OjwS nTEEIOn3nQcNvY4et8me/UyJd7yaAKWrocEsO9OxoztFo5EA42QdI2E/0fVCsPdXRTTdgnask /ZErxm4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 13 Sep 2016 11:32:22 +0200 Multiplications for the size determination of memory allocations indicated that array data structures should be processed. Thus use the corresponding function "kmalloc_array". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/block/virtio_blk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 93b1aaa..6553eb7 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -390,13 +390,13 @@ static int init_vq(struct virtio_blk *vblk) if (err) num_vqs = 1; - vblk->vqs = kmalloc(sizeof(*vblk->vqs) * num_vqs, GFP_KERNEL); + vblk->vqs = kmalloc_array(num_vqs, sizeof(*vblk->vqs), GFP_KERNEL); if (!vblk->vqs) return -ENOMEM; - names = kmalloc(sizeof(*names) * num_vqs, GFP_KERNEL); - callbacks = kmalloc(sizeof(*callbacks) * num_vqs, GFP_KERNEL); - vqs = kmalloc(sizeof(*vqs) * num_vqs, GFP_KERNEL); + names = kmalloc_array(num_vqs, sizeof(*names), GFP_KERNEL); + callbacks = kmalloc_array(num_vqs, sizeof(*callbacks), GFP_KERNEL); + vqs = kmalloc_array(num_vqs, sizeof(*vqs), GFP_KERNEL); if (!names || !callbacks || !vqs) { err = -ENOMEM; goto out; -- 2.10.0