Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / misc / vmw_vmci / vmci_host.c

diff --git a/drivers/misc/vmw_vmci/vmci_host.c b/drivers/misc/vmw_vmci/vmci_host.c
index 9ec262a526564134a0a61b4fa442549ea0ea2c57..ec090105eb4be7f9a8a3fbc2fd09168d011cca6c 100644 (file)
--- 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,
                return -EINVAL;
        }
 
-       dg = kmalloc(send_info.len, GFP_KERNEL);
-       if (!dg) {
+       dg = memdup_user((void __user *)(uintptr_t)send_info.addr,
+                        send_info.len);
+       if (IS_ERR(dg)) {
                vmci_ioctl_err(
                        "cannot allocate memory to dispatch datagram\n");
-               return -ENOMEM;
-       }
-
-       if (copy_from_user(dg, (void __user *)(uintptr_t)send_info.addr,
-                          send_info.len)) {
-               vmci_ioctl_err("error getting datagram\n");
-               kfree(dg);
-               return -EFAULT;
+               return PTR_ERR(dg);
        }
 
        if (VMCI_DG_SIZE(dg) != send_info.len) {