diff options
| author | Jim Mattson <jmattson@google.com> | 2022-09-30 00:51:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-11-10 18:15:41 +0100 |
| commit | 553fd40d3bf7f9077cb59f4f49dcbce082c745a3 (patch) | |
| tree | d62b060cebaad1befc373db76e51db4f40239614 | |
| parent | 006366b96c16090c9b73e8930b8dba0251658d83 (diff) | |
| download | linux-stable-553fd40d3bf7f9077cb59f4f49dcbce082c745a3.tar.gz linux-stable-553fd40d3bf7f9077cb59f4f49dcbce082c745a3.tar.bz2 linux-stable-553fd40d3bf7f9077cb59f4f49dcbce082c745a3.zip | |
KVM: x86: Mask off reserved bits in CPUID.80000001H
commit 0469e56a14bf8cfb80507e51b7aeec0332cdbc13 upstream.
KVM_GET_SUPPORTED_CPUID should only enumerate features that KVM
actually supports. CPUID.80000001:EBX[27:16] are reserved bits and
should be masked off.
Fixes: 0771671749b5 ("KVM: Enhance guest cpuid management")
Signed-off-by: Jim Mattson <jmattson@google.com>
Cc: stable@vger.kernel.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/kvm/cpuid.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 478721a33a1f..8f2a803ad036 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -902,6 +902,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) entry->eax = min(entry->eax, 0x8000001f); break; case 0x80000001: + entry->ebx &= ~GENMASK(27, 16); cpuid_entry_override(entry, CPUID_8000_0001_EDX); cpuid_entry_override(entry, CPUID_8000_0001_ECX); break; |