From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933076AbcIVGUf (ORCPT ); Thu, 22 Sep 2016 02:20:35 -0400 Received: from mout.web.de ([217.72.192.78]:65011 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932749AbcIVGU1 (ORCPT ); Thu, 22 Sep 2016 02:20:27 -0400 Subject: [PATCH 1/4] GPU-DRM-QXL: Use kmalloc_array() in qxl_device_init() To: dri-devel@lists.freedesktop.org, Bhaktipriya Shridhar , Daniel Vetter , David Airlie , =?UTF-8?Q?Noralf_Tr=c3=b8nnes?= , Tejun Heo , Thierry Reding References: Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <269141d5-6562-3d70-b823-283ecde6e09c@users.sourceforge.net> Date: Thu, 22 Sep 2016 08:20:11 +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: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:6K7Y0JPFK53cLQeF+vjZaAs4e7Krk0w5SCmcCK1oyenNBoZu9pJ phM0VSER913mPvPAFtWVotTKXiprkx7ITx6i2cEHOUVoGPA/ye2EW+wvlZmjisepGbpUCh3 hpyvMrBJmPKFnkkToS016yqgNVLVQw2e/PE1/4oYPgt4WYwqjrLXZwAuZGfDZkg//KcCXdD v5YXX4V4zVrr9fL1OlCGA== X-UI-Out-Filterresults: notjunk:1;V01:K0:EaEOtsbw9FI=:wSAM+82XtiNzYoP3PRoTGE X420eZNwqWTwCt/E9lO2Z3K1Vwu77SBl1/48zdaJ3chcsOqY8T7BFbrVyczabpHdhK0zzKaUd GY16LuKWdPeY01cwoZyw9HtXsZHUY7Nr1lcJmWleDxan6IuzLSbzeZIUvOBvt4UAcn3Glz7zo 94nYIkSCWfDLjCpW2M5ZQccf2VcqghVux1jhZmuj/S13ZHDKTnzAvxYvMNt7P183VLvDxm2z1 wA+3145BAJj5+5DyzEyKiKuIXpLzQ5C65S33NIGnOeOp3Ptkhuen7yL8Pkn87DakYxrSI9/6y v+prCwHfKmcAK0A6fAuKX1ItvKB3N/HCQvxi/7r2Qznbgz3/hNbRtFU6l+r/BV0ILjkQP7JEO RBmi/pIXNwa0RJ0k7HBef/0+QhpqYwRVCzSaNDxQgRhbCr4RtGZx8UZLzd8OXMgR/KXjrFRip 5vXqFc0Ghruc89qVcidNw6rwRgXtUrF1lMEIiGAYEQzPGrMbXDTOwm9F4UzJTlmObACZGhCQn CkUL2wuWPEv1x9KU4ct9RG349djZCdDHZ8lfBZqPZso1ufBqBvO1Tjse1j7GvWI9TaeLMygTN Q2v9YGkEo8TJcHW/8cgpXX6lGKbz0baMfwf17kBxpFl9Ts7L1hXkdVDVTx4RUqu/N9f0qG/3w vJ0AU3zkhkJaxv2/59fa99Y6gsmB5NZtjh2ifEgLuve4l2cJ0c4NbA2LOzmJ1haR8EFrfUVc+ 2x8QEGxTTiLMzIxXofHbeeXqBNP3WgOCMkRSoeQzJsyPJ/IrOsCsvgKBTbThMx4uQiNSMzVM6 CTl096b Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 21 Sep 2016 22:26:08 +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. * Add a bit of exception handling for a detected null pointer. Signed-off-by: Markus Elfring --- drivers/gpu/drm/qxl/qxl_kms.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_kms.c b/drivers/gpu/drm/qxl/qxl_kms.c index e642242..76852f1 100644 --- a/drivers/gpu/drm/qxl/qxl_kms.c +++ b/drivers/gpu/drm/qxl/qxl_kms.c @@ -216,10 +216,11 @@ static int qxl_device_init(struct qxl_device *qdev, qdev->slot_id_bits = qdev->rom->slot_id_bits; qdev->va_slot_mask = (~(uint64_t)0) >> (qdev->slot_id_bits + qdev->slot_gen_bits); - - qdev->mem_slots = - kmalloc(qdev->n_mem_slots * sizeof(struct qxl_memslot), - GFP_KERNEL); + qdev->mem_slots = kmalloc_array(qdev->n_mem_slots, + sizeof(*qdev->mem_slots), + GFP_KERNEL); + if (!qdev->mem_slots) + return -ENOMEM; idr_init(&qdev->release_idr); spin_lock_init(&qdev->release_idr_lock); -- 2.10.0