mirror of
https://github.com/torvalds/linux
synced 2024-10-05 02:44:13 +00:00
KVM: SVM: Make sure GHCB is mapped before updating
Access to the GHCB is mainly in the VMGEXIT path and it is known that the GHCB will be mapped. But there are two paths where it is possible the GHCB might not be mapped. The sev_vcpu_deliver_sipi_vector() routine will update the GHCB to inform the caller of the AP Reset Hold NAE event that a SIPI has been delivered. However, if a SIPI is performed without a corresponding AP Reset Hold, then the GHCB might not be mapped (depending on the previous VMEXIT), which will result in a NULL pointer dereference. The svm_complete_emulated_msr() routine will update the GHCB to inform the caller of a RDMSR/WRMSR operation about any errors. While it is likely that the GHCB will be mapped in this situation, add a safe guard in this path to be certain a NULL pointer dereference is not encountered. Fixes:f1c6366e30
("KVM: SVM: Add required changes to support intercepts under SEV-ES") Fixes:647daca25d
("KVM: SVM: Add support for booting APs in an SEV-ES guest") Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Cc: stable@vger.kernel.org Message-Id: <a5d3ebb600a91170fc88599d5a575452b3e31036.1617979121.git.thomas.lendacky@amd.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
a1fa4cbd53
commit
a3ba26ecfb
|
@ -2104,5 +2104,8 @@ void sev_vcpu_deliver_sipi_vector(struct kvm_vcpu *vcpu, u8 vector)
|
|||
* the guest will set the CS and RIP. Set SW_EXIT_INFO_2 to a
|
||||
* non-zero value.
|
||||
*/
|
||||
if (!svm->ghcb)
|
||||
return;
|
||||
|
||||
ghcb_set_sw_exit_info_2(svm->ghcb, 1);
|
||||
}
|
||||
|
|
|
@ -2757,7 +2757,7 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
|
|||
static int svm_complete_emulated_msr(struct kvm_vcpu *vcpu, int err)
|
||||
{
|
||||
struct vcpu_svm *svm = to_svm(vcpu);
|
||||
if (!sev_es_guest(vcpu->kvm) || !err)
|
||||
if (!err || !sev_es_guest(vcpu->kvm) || WARN_ON_ONCE(!svm->ghcb))
|
||||
return kvm_complete_insn_gp(vcpu, err);
|
||||
|
||||
ghcb_set_sw_exit_info_1(svm->ghcb, 1);
|
||||
|
|
Loading…
Reference in a new issue