From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751984AbdKVP3W (ORCPT ); Wed, 22 Nov 2017 10:29:22 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:41570 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751663AbdKVP3R (ORCPT ); Wed, 22 Nov 2017 10:29:17 -0500 X-Google-Smtp-Source: AGs4zMaT360xjVpqciIRIgwldTdRxElQS0k2h0pDv2irMKWPMLavrax057Ngdo5A4Z2n01bllIUyoQ== From: Vasyl Gomonovych To: mingo@kernel.org Cc: linux-kernel@vger.kernel.org, gomonovych@gmail.com Subject: [PATCH] VMCI: Use memdup_user() as a cleanup Date: Wed, 22 Nov 2017 16:29:07 +0100 Message-Id: <1511364547-18418-1-git-send-email-gomonovych@gmail.com> X-Mailer: git-send-email 1.9.1 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/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 | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/misc/vmw_vmci/vmci_host.c b/drivers/misc/vmw_vmci/vmci_host.c index 8a16a26e9658..b8468b864bcd 100644 --- a/drivers/misc/vmw_vmci/vmci_host.c +++ b/drivers/misc/vmw_vmci/vmci_host.c @@ -754,18 +754,12 @@ 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); @@ -774,7 +768,6 @@ static int vmci_host_do_ctx_set_cpt_state(struct vmci_host_dev *vmci_host_dev, retval = copy_to_user(uptr, &set_info, sizeof(set_info)) ? -EFAULT : 0; -out: kfree(cpt_buf); return retval; } -- 1.9.1