From c788d861dc057d7f256a84f1cdb0330eef5ccc1f Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Mon, 4 Apr 2011 12:39:26 +0200
Subject: [PATCH] --- yaml --- r: 248007 b: refs/heads/master c:
 8ea7d6aef84e278fcb121acff1bd4c3edaa95b8b h: refs/heads/master i:   248005:
 a6c68611b09edcc2918abbebed2ec6334d054e84   248003:
 dfac1d2f7d828b7491f44c31bf5200c4045f7c08   247999:
 f73106a3ae4bc26c25f3b4a89689d22a8e38e492 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/include/asm/kvm_emulate.h | 4 ++++
 trunk/arch/x86/kvm/emulate.c             | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 01b6ab982cfb..3dc375f4cf89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d09beabd7cd4cf70d982ff54656dc6431df80fa4
+refs/heads/master: 8ea7d6aef84e278fcb121acff1bd4c3edaa95b8b
diff --git a/trunk/arch/x86/include/asm/kvm_emulate.h b/trunk/arch/x86/include/asm/kvm_emulate.h
index 460c2d8964b7..cab841a034f9 100644
--- a/trunk/arch/x86/include/asm/kvm_emulate.h
+++ b/trunk/arch/x86/include/asm/kvm_emulate.h
@@ -274,6 +274,10 @@ struct x86_emulate_ctxt {
 #define X86EMUL_MODE_PROT32   4	/* 32-bit protected mode. */
 #define X86EMUL_MODE_PROT64   8	/* 64-bit (long) mode.    */
 
+/* any protected mode   */
+#define X86EMUL_MODE_PROT     (X86EMUL_MODE_PROT16|X86EMUL_MODE_PROT32| \
+			       X86EMUL_MODE_PROT64)
+
 enum x86_intercept_stage {
 	X86_ICPT_PRE_EXCEPT,
 	X86_ICPT_POST_EXCEPT,
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
index 4822824b608b..3f32a6699fbd 100644
--- a/trunk/arch/x86/kvm/emulate.c
+++ b/trunk/arch/x86/kvm/emulate.c
@@ -78,6 +78,7 @@
 #define Prefix      (1<<16)     /* Instruction varies with 66/f2/f3 prefix */
 #define Sse         (1<<17)     /* SSE Vector instruction */
 /* Misc flags */
+#define Prot        (1<<21) /* instruction generates #UD if not in prot-mode */
 #define VendorSpecific (1<<22) /* Vendor specific instruction */
 #define NoAccess    (1<<23) /* Don't access memory (lea/invlpg/verr etc) */
 #define Op3264      (1<<24) /* Operand is 64b in long mode, 32b otherwise */
@@ -3143,6 +3144,12 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 		goto done;
 	}
 
+	/* Instruction can only be executed in protected mode */
+	if ((c->d & Prot) && !(ctxt->mode & X86EMUL_MODE_PROT)) {
+		rc = emulate_ud(ctxt);
+		goto done;
+	}
+
 	/* Do instruction specific permission checks */
 	if (c->check_perm) {
 		rc = c->check_perm(ctxt);