xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KVM: x86: Clean up error handling in kvm_dev_ioctl_get_cpuid()

Browse Source 
Clean up the error handling in kvm_dev_ioctl_get_cpuid(), which has
gotten a bit crusty as the function has evolved over the years.

Opportunistically hoist the static @funcs declaration to the top of the
function to make it more obvious that it's a "static const".

No functional change intended.

Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Sean Christopherson
2020-03-02 15:56:07 -08:00
committed by Paolo Bonzini
parent 8b86079cc3
commit d5a661d19d
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86/kvm/cpuid.c
View File

@@ -889,45 +889,40 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid,
struct kvm_cpuid_entry2 __user *entries, struct kvm_cpuid_entry2 __user *entries,
unsigned int type) unsigned int type)
{ {
struct kvm_cpuid_entry2 *cpuid_entries;
int nent = 0, r = -E2BIG, i;
static const u32 funcs[] = { static const u32 funcs[] = {
0, 0x80000000, CENTAUR_CPUID_SIGNATURE, KVM_CPUID_SIGNATURE, 0, 0x80000000, CENTAUR_CPUID_SIGNATURE, KVM_CPUID_SIGNATURE,
}; };
struct kvm_cpuid_entry2 *cpuid_entries;
int nent = 0, r, i;
if (cpuid->nent < 1) if (cpuid->nent < 1)
goto out; return -E2BIG;
if (cpuid->nent > KVM_MAX_CPUID_ENTRIES) if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
cpuid->nent = KVM_MAX_CPUID_ENTRIES; cpuid->nent = KVM_MAX_CPUID_ENTRIES;
if (sanity_check_entries(entries, cpuid->nent, type)) if (sanity_check_entries(entries, cpuid->nent, type))
return -EINVAL; return -EINVAL;
r = -ENOMEM;
cpuid_entries = vzalloc(array_size(sizeof(struct kvm_cpuid_entry2), cpuid_entries = vzalloc(array_size(sizeof(struct kvm_cpuid_entry2),
cpuid->nent)); cpuid->nent));
if (!cpuid_entries) if (!cpuid_entries)
goto out; return -ENOMEM;
r = 0;
for (i = 0; i < ARRAY_SIZE(funcs); i++) { for (i = 0; i < ARRAY_SIZE(funcs); i++) {
r = get_cpuid_func(cpuid_entries, funcs[i], &nent, cpuid->nent, r = get_cpuid_func(cpuid_entries, funcs[i], &nent, cpuid->nent,
type); type);
if (r) if (r)
goto out_free; goto out_free;
} }
cpuid->nent = nent;
r = -EFAULT;
if (copy_to_user(entries, cpuid_entries, if (copy_to_user(entries, cpuid_entries,
nent * sizeof(struct kvm_cpuid_entry2))) nent * sizeof(struct kvm_cpuid_entry2)))
goto out_free; r = -EFAULT;
cpuid->nent = nent;
r = 0;
out_free: out_free:
vfree(cpuid_entries); vfree(cpuid_entries);
out:
return r; return r;
} }