KVM: nSVM: more strict SMM checks when returning to nested guest (3ebb5d26) · Commits · 戴 / test

* check that guest is 64 bit guest, otherwise the SVM related fields in the smm state area are not defined * If the SMM area indicates that SMM interrupted a running guest, check that EFER.SVME which is also saved in this area is set, otherwise the guest might have tampered with SMM save area, and so indicate emulation failure which should triple fault the guest. * Check that that guest CPUID supports SVM (due to the same issue as above) Signed-off-by:

Maxim Levitsky <mlevitsk@redhat.com> Message-Id: <20200827162720.278690-4-mlevitsk@redhat.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/svm/svm.c

+18 −11

Original line number	Diff line number	Diff line
		@@ -3899,22 +3899,29 @@ static int svm_pre_enter_smm(struct kvm_vcpu vcpu, char smstate)
		static int svm_pre_leave_smm(struct kvm_vcpu vcpu, const char smstate)
		{
		struct vcpu_svm *svm = to_svm(vcpu);
		struct vmcb *nested_vmcb;
		struct kvm_host_map map;
		u64 guest;
		u64 vmcb;
		int ret = 0;

		guest = GET_SMSTATE(u64, smstate, 0x7ed8);
		vmcb = GET_SMSTATE(u64, smstate, 0x7ee0);
		if (guest_cpuid_has(vcpu, X86_FEATURE_LM)) {
		u64 saved_efer = GET_SMSTATE(u64, smstate, 0x7ed0);
		u64 guest = GET_SMSTATE(u64, smstate, 0x7ed8);
		u64 vmcb = GET_SMSTATE(u64, smstate, 0x7ee0);

		if (guest) {
		if (kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb), &map) == -EINVAL)
		if (!guest_cpuid_has(vcpu, X86_FEATURE_SVM))
		return 1;
		nested_vmcb = map.hva;
		ret = enter_svm_guest_mode(svm, vmcb, nested_vmcb);

		if (!(saved_efer & EFER_SVME))
		return 1;

		if (kvm_vcpu_map(&svm->vcpu,
		gpa_to_gfn(vmcb), &map) == -EINVAL)
		return 1;

		ret = enter_svm_guest_mode(svm, vmcb, map.hva);
		kvm_vcpu_unmap(&svm->vcpu, &map, true);
		}
		}

		return ret;
		}

Admin message