Commit c9b8fecd authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6d849191

arch/x86/kvm/cpuid.c

+2 −3
Original line number Diff line number Diff line
@@ -1290,8 +1290,7 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, 
	if (sanity_check_entries(entries, cpuid->nent, type))

		return -EINVAL;



	array.entries = vzalloc(array_size(sizeof(struct kvm_cpuid_entry2),

					   cpuid->nent));

	array.entries = kvcalloc(sizeof(struct kvm_cpuid_entry2), cpuid->nent, GFP_KERNEL);

	if (!array.entries)

		return -ENOMEM;
@@ -1309,7 +1308,7 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, 
		r = -EFAULT;



out_free:

	vfree(array.entries);

	kvfree(array.entries);

	return r;

}