Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Vasyl Gomonovych <gomonovych@gmail.com>
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>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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 <gomonovych@gmail.com>
---
 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


From 1584808256700638107@xxx Wed Nov 22 22:48:50 +0000 2017
X-GM-THRID: 1584807116228487842
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread