From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753962AbdLMWCU (ORCPT ); Wed, 13 Dec 2017 17:02:20 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:42832 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753905AbdLMWCQ (ORCPT ); Wed, 13 Dec 2017 17:02:16 -0500 X-Google-Smtp-Source: ACJfBoucrJ6AaEmkBerQT0nCvo6bqaclouVq+v9XWxVCXh5PeiciUCvA6vPUTTnaY39OQvTvQ8Pk1Q== From: Vasyl Gomonovych To: gregkh@linuxfoundation.org, sfr@canb.auug.org.au, arnd@arndb.de, sudeep.dutt@intel.com, ashutosh.dixit@intel.com, dan.carpenter@oracle.com Cc: Vasyl Gomonovych , linux-kernel@vger.kernel.org Subject: [PATCH v3] misc: mic: Use memdup_user() as a cleanup Date: Wed, 13 Dec 2017 23:01:08 +0100 Message-Id: <1513202470-29700-1-git-send-email-gomonovych@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <20171213093027.GA13194@kroah.com> References: <20171213093027.GA13194@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix coccicheck warning which recommends to use memdup_user(): drivers/misc/mic/vop/vop_vringh.c:940:14-21: WARNING opportunity for memdup_user drivers/misc/mic/vop/vop_vringh.c:998:8-15: WARNING opportunity for memdup_user Generated by: scripts/coccinelle/memdup_user/memdup_user.cocci Signed-off-by: Vasyl Gomonovych --- I'm not sure if this still valid, maybe warning was fixed already. In that case sorry for this disturbing noise. Changelog: - v1: - Replace kzalloc + copy_from_user by memdup_user - v2: - Sorry for this disturb - Fix warning: label done defined but not used Introduced by previous commit misc: mic: Use memdup_user() as a cleanup drivers/misc/mic/vop/vop_vringh.c:1001:1: warning: label 'done' defined but not used [-Wunused-label] drivers/misc/mic/vop/vop_vringh.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c index fed992e2c258..27db64ec9efe 100644 --- a/drivers/misc/mic/vop/vop_vringh.c +++ b/drivers/misc/mic/vop/vop_vringh.c @@ -937,13 +937,10 @@ static long vop_ioctl(struct file *f, unsigned int cmd, unsigned long arg) dd.num_vq > MIC_MAX_VRINGS) return -EINVAL; - dd_config = kzalloc(mic_desc_size(&dd), GFP_KERNEL); - if (!dd_config) - return -ENOMEM; - if (copy_from_user(dd_config, argp, mic_desc_size(&dd))) { - ret = -EFAULT; - goto free_ret; - } + dd_config = memdup_user(argp, mic_desc_size(&dd)); + if (IS_ERR(dd_config)) + return PTR_ERR(dd_config); + /* Ensure desc has not changed between the two reads */ if (memcmp(&dd, dd_config, sizeof(dd))) { ret = -EINVAL; @@ -995,17 +992,12 @@ static long vop_ioctl(struct file *f, unsigned int cmd, unsigned long arg) ret = vop_vdev_inited(vdev); if (ret) goto __unlock_ret; - buf = kzalloc(vdev->dd->config_len, GFP_KERNEL); - if (!buf) { - ret = -ENOMEM; + buf = memdup_user(argp, vdev->dd->config_len); + if (IS_ERR(buf)) { + ret = PTR_ERR(buf); goto __unlock_ret; } - if (copy_from_user(buf, argp, vdev->dd->config_len)) { - ret = -EFAULT; - goto done; - } ret = vop_virtio_config_change(vdev, buf); -done: kfree(buf); __unlock_ret: mutex_unlock(&vdev->vdev_mutex); -- 1.9.1