KVM: Use vmemdup_user()

Replace opencoded alloc and copy with vmemdup_user().

Signed-off-by: Denis Efremov <efremov@linux.com>
Message-Id: <20200603101131.2107303-1-efremov@linux.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index 9ca32d96993887707d3b39c33da21df74394be38..8a294f9747aad2f7feafb945d607d95a4b5d3451 100644 (file)
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -181,17 +181,14 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
        r = -E2BIG;
        if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
                goto out;
-       r = -ENOMEM;
        if (cpuid->nent) {
-               cpuid_entries =
-                       vmalloc(array_size(sizeof(struct kvm_cpuid_entry),
-                                          cpuid->nent));
-               if (!cpuid_entries)
-                       goto out;
-               r = -EFAULT;
-               if (copy_from_user(cpuid_entries, entries,
-                                  cpuid->nent * sizeof(struct kvm_cpuid_entry)))
+               cpuid_entries = vmemdup_user(entries,
+                                            array_size(sizeof(struct kvm_cpuid_entry),
+                                                       cpuid->nent));
+               if (IS_ERR(cpuid_entries)) {
+                       r = PTR_ERR(cpuid_entries);
                        goto out;
+               }
        }
        for (i = 0; i < cpuid->nent; i++) {
                vcpu->arch.cpuid_entries[i].function = cpuid_entries[i].function;
@@ -211,8 +208,8 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,
        kvm_x86_ops.cpuid_update(vcpu);
        r = kvm_update_cpuid(vcpu);
 
+       kvfree(cpuid_entries);
 out:
-       vfree(cpuid_entries);
        return r;
 }
 

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 3577eb84eac0b5dad284d992e274d05a1ecf3e4a..4db151f6101ed005df5487a690f7e145d72d058a 100644 (file)
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -3746,21 +3746,18 @@ static long kvm_vm_ioctl(struct file *filp,
                if (routing.flags)
                        goto out;
                if (routing.nr) {
-                       r = -ENOMEM;
-                       entries = vmalloc(array_size(sizeof(*entries),
-                                                    routing.nr));
-                       if (!entries)
-                               goto out;
-                       r = -EFAULT;
                        urouting = argp;
-                       if (copy_from_user(entries, urouting->entries,
-                                          routing.nr * sizeof(*entries)))
-                               goto out_free_irq_routing;
+                       entries = vmemdup_user(urouting->entries,
+                                              array_size(sizeof(*entries),
+                                                         routing.nr));
+                       if (IS_ERR(entries)) {
+                               r = PTR_ERR(entries);
+                               goto out;
+                       }
                }
                r = kvm_set_irq_routing(kvm, entries, routing.nr,
                                        routing.flags);
-out_free_irq_routing:
-               vfree(entries);
+               kvfree(entries);
                break;
        }
 #endif /* CONFIG_HAVE_KVM_IRQ_ROUTING */