]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
KVM: SVM: relax conditions for allowing MSR_IA32_SPEC_CTRL accesses
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 5 Feb 2020 15:10:52 +0000 (16:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 6 Jan 2021 13:48:36 +0000 (14:48 +0100)
commit3d4a05894500693ff25ba99fc38994044a92236b
tree6170aff47aa2a53617fed1d2901c5a59601c6aaa
parentd77c1ab54c9edf38a1723902c9eaba133b5ca6c8
KVM: SVM: relax conditions for allowing MSR_IA32_SPEC_CTRL accesses

[ Upstream commit df7e8818926eb4712b67421442acf7d568fe2645 ]

Userspace that does not know about the AMD_IBRS bit might still
allow the guest to protect itself with MSR_IA32_SPEC_CTRL using
the Intel SPEC_CTRL bit.  However, svm.c disallows this and will
cause a #GP in the guest when writing to the MSR.  Fix this by
loosening the test and allowing the Intel CPUID bit, and in fact
allow the AMD_STIBP bit as well since it allows writing to
MSR_IA32_SPEC_CTRL too.

Reported-by: Zhiyi Guo <zhguo@redhat.com>
Analyzed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Analyzed-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kvm/svm.c