]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
KVM: x86: Mask off reserved bits in CPUID.80000008H
authorJim Mattson <jmattson@google.com>
Thu, 29 Sep 2022 22:52:00 +0000 (15:52 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Nov 2022 16:46:56 +0000 (17:46 +0100)
commit0e40b4b83e261efd28ac386f68e529d6ea8c1b40
tree8ef873fdd60fcde7fb4bdd16a816a0302fb4bb2e
parent890d738f569fa9412b70ba09f15407f17a52da20
KVM: x86: Mask off reserved bits in CPUID.80000008H

commit 7030d8530e533844e2f4b0e7476498afcd324634 upstream.

KVM_GET_SUPPORTED_CPUID should only enumerate features that KVM
actually supports. The following ranges of CPUID.80000008H are reserved
and should be masked off:
    ECX[31:18]
    ECX[11:8]

In addition, the PerfTscSize field at ECX[17:16] should also be zero
because KVM does not set the PERFTSC bit at CPUID.80000001H.ECX[27].

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