From: Avi Kivity <avi@redhat.com>
Date: Tue, 11 May 2010 21:28:44 +0000 (+0300)
Subject: KVM: Don't allow lmsw to clear cr0.pe
X-Git-Tag: v2.6.34.1~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=52be6f3f5c4f964c154be2a97f9e22be6837c98d;p=karo-tx-linux.git

KVM: Don't allow lmsw to clear cr0.pe

The current lmsw implementation allows the guest to clear cr0.pe, contrary
to the manual, which breaks EMM386.EXE.

Fix by ORing the old cr0.pe with lmsw's operand.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

(Cherry-picked from commit f78e917688edbf1f14c318d2e50dc8e7dad20445)
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 7635a38fe84d..d9680b3c40ef 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -484,7 +484,7 @@ EXPORT_SYMBOL_GPL(kvm_set_cr0);
 
 void kvm_lmsw(struct kvm_vcpu *vcpu, unsigned long msw)
 {
-	kvm_set_cr0(vcpu, kvm_read_cr0_bits(vcpu, ~0x0ful) | (msw & 0x0f));
+	kvm_set_cr0(vcpu, kvm_read_cr0_bits(vcpu, ~0x0eul) | (msw & 0x0f));
 }
 EXPORT_SYMBOL_GPL(kvm_lmsw);