* [PATCH] VMCI: Use memdup_user() as a cleanup
@ 2017-11-22 15:29 Vasyl Gomonovych
2017-11-22 15:55 ` Joe Perches
2017-11-22 22:42 ` [PATCH v2] " Vasyl Gomonovych
0 siblings, 2 replies; 4+ messages in thread
From: Vasyl Gomonovych @ 2017-11-22 15:29 UTC (permalink / raw)
To: mingo; +Cc: linux-kernel, gomonovych
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] VMCI: Use memdup_user() as a cleanup
2017-11-22 15:29 [PATCH] VMCI: Use memdup_user() as a cleanup Vasyl Gomonovych
@ 2017-11-22 15:55 ` Joe Perches
2017-11-22 20:46 ` Gomonovych, Vasyl
2017-11-22 22:42 ` [PATCH v2] " Vasyl Gomonovych
1 sibling, 1 reply; 4+ messages in thread
From: Joe Perches @ 2017-11-22 15:55 UTC (permalink / raw)
To: Vasyl Gomonovych, mingo; +Cc: linux-kernel
On Wed, 2017-11-22 at 16:29 +0100, Vasyl Gomonovych wrote:
> 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
Nice little cleanup.
> diff --git 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,
[]
> + 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);
Trivia:
The vmci_ioctl_err might not be necessary.
There is a dump_stack() on allocation failure.
and
> @@ -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;
Perhaps move the kfree above the copy_to_user,
remove the retval declaration and use
return copy_to_user(uptr, &set_info, sizeof(set_info)) ? -EFAULT : 0;
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] VMCI: Use memdup_user() as a cleanup
2017-11-22 15:55 ` Joe Perches
@ 2017-11-22 20:46 ` Gomonovych, Vasyl
0 siblings, 0 replies; 4+ messages in thread
From: Gomonovych, Vasyl @ 2017-11-22 20:46 UTC (permalink / raw)
To: Joe Perches; +Cc: linux-kernel
I am agree, I will change it.
On Wed, Nov 22, 2017 at 4:55 PM, Joe Perches <joe@perches.com> wrote:
> On Wed, 2017-11-22 at 16:29 +0100, Vasyl Gomonovych wrote:
>> 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
>
> Nice little cleanup.
>
>> diff --git 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,
> []
>> + 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);
>
> Trivia:
>
> The vmci_ioctl_err might not be necessary.
> There is a dump_stack() on allocation failure.
>
> and
>
>> @@ -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;
>
> Perhaps move the kfree above the copy_to_user,
> remove the retval declaration and use
>
> return copy_to_user(uptr, &set_info, sizeof(set_info)) ? -EFAULT : 0;
>
--
Доброї вам пори дня.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] VMCI: Use memdup_user() as a cleanup
2017-11-22 15:29 [PATCH] VMCI: Use memdup_user() as a cleanup Vasyl Gomonovych
2017-11-22 15:55 ` Joe Perches
@ 2017-11-22 22:42 ` Vasyl Gomonovych
1 sibling, 0 replies; 4+ messages in thread
From: Vasyl Gomonovych @ 2017-11-22 22:42 UTC (permalink / raw)
To: joe, mingo; +Cc: linux-kernel, Vasyl Gomonovych
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 <gomonovych@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-22 22:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-22 15:29 [PATCH] VMCI: Use memdup_user() as a cleanup Vasyl Gomonovych
2017-11-22 15:55 ` Joe Perches
2017-11-22 20:46 ` Gomonovych, Vasyl
2017-11-22 22:42 ` [PATCH v2] " Vasyl Gomonovych
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox