OSDN Git Service

KVM: x86: fix CPUID entries returned by KVM_GET_CPUID2 ioctl
authorMichael Roth <michael.roth@amd.com>
Thu, 28 Jan 2021 02:44:51 +0000 (20:44 -0600)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 28 Jan 2021 07:40:11 +0000 (02:40 -0500)
commit181f494888d5b178ffda41bed965f187d5e5c432
treef7b92bdd8cfa39361a2b1076d3194f0f2e90d4dc
parent9a78e15802a87de2b08dfd1bd88e855201d2c8fa
KVM: x86: fix CPUID entries returned by KVM_GET_CPUID2 ioctl

Recent commit 255cbecfe0 modified struct kvm_vcpu_arch to make
'cpuid_entries' a pointer to an array of kvm_cpuid_entry2 entries
rather than embedding the array in the struct. KVM_SET_CPUID and
KVM_SET_CPUID2 were updated accordingly, but KVM_GET_CPUID2 was missed.

As a result, KVM_GET_CPUID2 currently returns random fields from struct
kvm_vcpu_arch to userspace rather than the expected CPUID values. Fix
this by treating 'cpuid_entries' as a pointer when copying its
contents to userspace buffer.

Fixes: 255cbecfe0c9 ("KVM: x86: allocate vcpu->arch.cpuid_entries dynamically")
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: Michael Roth <michael.roth@amd.com.com>
Message-Id: <20210128024451.1816770-1-michael.roth@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/cpuid.c