From: Gleb Natapov <gleb@redhat.com>
Date: Sun, 14 Apr 2013 13:07:37 +0000 (+0300)
Subject: KVM: VMX: Fix check guest state validity if a guest is in VM86 mode
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f13882d84df31a8567032b6bcbfbdd76ac378513;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

KVM: VMX: Fix check guest state validity if a guest is in VM86 mode

If guest vcpu is in VM86 mode the vcpu state should be checked as if in
real mode.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 8d52bcf371df..c84f0cb921f9 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3605,7 +3605,7 @@ static bool guest_state_valid(struct kvm_vcpu *vcpu)
 		return true;
 
 	/* real mode guest state checks */
-	if (!is_protmode(vcpu)) {
+	if (!is_protmode(vcpu) || (vmx_get_rflags(vcpu) & X86_EFLAGS_VM)) {
 		if (!rmode_segment_valid(vcpu, VCPU_SREG_CS))
 			return false;
 		if (!rmode_segment_valid(vcpu, VCPU_SREG_SS))