diff options
author | Muhammad Falak R Wani <falakreyaz@gmail.com> | 2016-05-20 08:18:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-31 07:18:10 -0400 |
commit | 655745b0d1ebeceb0453f1c6adca154a4fac0ad5 (patch) | |
tree | 038d825baf87f9f7a7845c52e3203aa2d0ef41fc /drivers/misc | |
parent | b58189b3c5cf54689a0c154e4d9cff918a29ab0b (diff) |
VMCI: use memdup_user().
Use memdup_user to duplicate a memory region from user-space to
kernel-space, instead of open coding using kmalloc & copy_from_user.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/vmw_vmci/vmci_host.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/misc/vmw_vmci/vmci_host.c b/drivers/misc/vmw_vmci/vmci_host.c index 9ec262a52656..ec090105eb4b 100644 --- a/drivers/misc/vmw_vmci/vmci_host.c +++ b/drivers/misc/vmw_vmci/vmci_host.c | |||
@@ -381,18 +381,12 @@ static int vmci_host_do_send_datagram(struct vmci_host_dev *vmci_host_dev, | |||
381 | return -EINVAL; | 381 | return -EINVAL; |
382 | } | 382 | } |
383 | 383 | ||
384 | dg = kmalloc(send_info.len, GFP_KERNEL); | 384 | dg = memdup_user((void __user *)(uintptr_t)send_info.addr, |
385 | if (!dg) { | 385 | send_info.len); |
386 | if (IS_ERR(dg)) { | ||
386 | vmci_ioctl_err( | 387 | vmci_ioctl_err( |
387 | "cannot allocate memory to dispatch datagram\n"); | 388 | "cannot allocate memory to dispatch datagram\n"); |
388 | return -ENOMEM; | 389 | return PTR_ERR(dg); |
389 | } | ||
390 | |||
391 | if (copy_from_user(dg, (void __user *)(uintptr_t)send_info.addr, | ||
392 | send_info.len)) { | ||
393 | vmci_ioctl_err("error getting datagram\n"); | ||
394 | kfree(dg); | ||
395 | return -EFAULT; | ||
396 | } | 390 | } |
397 | 391 | ||
398 | if (VMCI_DG_SIZE(dg) != send_info.len) { | 392 | if (VMCI_DG_SIZE(dg) != send_info.len) { |