]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
KVM: x86: Mask off reserved bits in CPUID.8000001AH
authorJim Mattson <jmattson@google.com>
Thu, 29 Sep 2022 22:52:01 +0000 (15:52 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Nov 2022 17:14:28 +0000 (18:14 +0100)
commit 079f6889818dd07903fb36c252532ab47ebb6d48 upstream.

KVM_GET_SUPPORTED_CPUID should only enumerate features that KVM
actually supports. In the case of CPUID.8000001AH, only three bits are
currently defined. The 125 reserved bits should be masked off.

Fixes: 24c82e576b78 ("KVM: Sanitize cpuid")
Signed-off-by: Jim Mattson <jmattson@google.com>
Message-Id: <20220929225203.2234702-4-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>
arch/x86/kvm/cpuid.c

index f5870217a472c32d02f77d2ac7d57d86d6c74e5b..a4c6973c8b7b0571b5707e0710419c62ce3e985f 100644 (file)
@@ -860,6 +860,9 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function)
                entry->ecx = entry->edx = 0;
                break;
        case 0x8000001a:
+               entry->eax &= GENMASK(2, 0);
+               entry->ebx = entry->ecx = entry->edx = 0;
+               break;
        case 0x8000001e:
                break;
        /* Support memory encryption cpuid if host supports it */