Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f8da478 authored by Joerg Roedel's avatar Joerg Roedel Committed by Avi Kivity
Browse files

KVM: SVM: handle errors in vmrun emulation path appropriatly 



If nested svm fails to load the msrpm the vmrun succeeds with the old
msrpm which is not correct. This patch changes the logic to roll back
to host mode in case the msrpm cannot be loaded.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent ea8e064f

arch/x86/kvm/svm.c

+13 −1
Original line number Diff line number Diff line
@@ -1874,6 +1874,7 @@ static int vmsave_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) 
static int vmrun_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run)

{

	nsvm_printk("VMrun\n");



	if (nested_svm_check_permissions(svm))

		return 1;
@@ -1884,8 +1885,19 @@ static int vmrun_interception(struct vcpu_svm *svm, struct kvm_run *kvm_run) 
		return 1;



	if (!nested_svm_vmrun_msrpm(svm))

		goto failed;



	return 1;



failed:



	svm->vmcb->control.exit_code    = SVM_EXIT_ERR;

	svm->vmcb->control.exit_code_hi = 0;

	svm->vmcb->control.exit_info_1  = 0;

	svm->vmcb->control.exit_info_2  = 0;



	nested_svm_vmexit(svm);



	return 1;

}