forked from Minki/linux
KVM: use kvcalloc for array allocations
Instead of using array_size, use a function that takes care of the multiplication. While at it, switch to kvcalloc since this allocation should not be very large. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
6d8491910f
commit
c9b8fecddb
@ -1290,8 +1290,7 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid,
|
|||||||
if (sanity_check_entries(entries, cpuid->nent, type))
|
if (sanity_check_entries(entries, cpuid->nent, type))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
array.entries = vzalloc(array_size(sizeof(struct kvm_cpuid_entry2),
|
array.entries = kvcalloc(sizeof(struct kvm_cpuid_entry2), cpuid->nent, GFP_KERNEL);
|
||||||
cpuid->nent));
|
|
||||||
if (!array.entries)
|
if (!array.entries)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
@ -1309,7 +1308,7 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid,
|
|||||||
r = -EFAULT;
|
r = -EFAULT;
|
||||||
|
|
||||||
out_free:
|
out_free:
|
||||||
vfree(array.entries);
|
kvfree(array.entries);
|
||||||
return r;
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user