From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753326AbdKVWmg (ORCPT ); Wed, 22 Nov 2017 17:42:36 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:33441 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751566AbdKVWme (ORCPT ); Wed, 22 Nov 2017 17:42:34 -0500 X-Google-Smtp-Source: AGs4zMbhZ/OxND2TpB2cIJulu8L1frVGQnD/HyBA6JOHWSLCja7FtjvPT8OubHNDg1rDru08zEYNMw== From: Vasyl Gomonovych To: joe@perches.com, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, Vasyl Gomonovych Subject: [PATCH v2] VMCI: Use memdup_user() as a cleanup Date: Wed, 22 Nov 2017 23:42:18 +0100 Message-Id: <1511390538-3899-1-git-send-email-gomonovych@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1511364547-18418-1-git-send-email-gomonovych@gmail.com> References: <1511364547-18418-1-git-send-email-gomonovych@gmail.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() and relative cleanup drivers/misc/vmw_vmci/vmci_host.c:757:11-18: WARNING opportunity for memdup_user Generated by: scripts/coccinelle/memdup_user/memdup_user.cocci Signed-off-by: Vasyl Gomonovych --- drivers/misc/vmw_vmci/vmci_host.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/drivers/misc/vmw_vmci/vmci_host.c b/drivers/misc/vmw_vmci/vmci_host.c index 8a16a26e9658..b0416dcc590a 100644 --- a/drivers/misc/vmw_vmci/vmci_host.c +++ b/drivers/misc/vmw_vmci/vmci_host.c @@ -744,7 +744,6 @@ static int vmci_host_do_ctx_set_cpt_state(struct vmci_host_dev *vmci_host_dev, struct vmci_ctx_chkpt_buf_info set_info; u32 cid; void *cpt_buf; - int retval; if (vmci_host_dev->ct_type != VMCIOBJ_CONTEXT) { vmci_ioctl_err("only valid for contexts\n"); @@ -754,29 +753,21 @@ static int vmci_host_do_ctx_set_cpt_state(struct vmci_host_dev *vmci_host_dev, if (copy_from_user(&set_info, uptr, sizeof(set_info))) return -EFAULT; - cpt_buf = kmalloc(set_info.buf_size, GFP_KERNEL); - if (!cpt_buf) { - vmci_ioctl_err( - "cannot allocate memory to set cpt state (type=%d)\n", - set_info.cpt_type); - return -ENOMEM; - } - - if (copy_from_user(cpt_buf, (void __user *)(uintptr_t)set_info.cpt_buf, - set_info.buf_size)) { - retval = -EFAULT; - goto out; + cpt_buf = memdup_user((void __user *)(uintptr_t)set_info.cpt_buf, + set_info.buf_size); + if (IS_ERR(cpt_buf)) { + vmci_ioctl_err("cannot allocate memory to set cpt state (type=%d)\n", + set_info.cpt_type); + return PTR_ERR(cpt_buf); } cid = vmci_ctx_get_id(vmci_host_dev->context); set_info.result = vmci_ctx_set_chkpt_state(cid, set_info.cpt_type, set_info.buf_size, cpt_buf); - retval = copy_to_user(uptr, &set_info, sizeof(set_info)) ? -EFAULT : 0; - -out: kfree(cpt_buf); - return retval; + + return copy_to_user(uptr, &set_info, sizeof(set_info)) ? -EFAULT : 0; } static int vmci_host_do_get_context_id(struct vmci_host_dev *vmci_host_dev, -- 1.9.1