---

yaml --- r: 215786 b: refs/heads/master c: 081bca0 h: refs/heads/master v: v3
git-mirror · Oct 24, 2010 · ecf5887 · ecf5887
1 parent 8106cb4
commit ecf5887
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2ddd1c48364e4161052d6089f06b2cf3c50496b
+refs/heads/master: 081bca0e6b87d0c7b9ade7ffee1f44aca336a8fa
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
@@ -2974,6 +2974,11 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
 		goto done;
 	}
 
+	if ((c->d & SrcMask) == SrcMemFAddr && c->src.type != OP_MEM) {
+		emulate_ud(ctxt);
+		goto done;
+	}
+
 	/* Privileged instruction can be executed only in CPL=0 */
 	if ((c->d & Priv) && ops->cpl(ctxt->vcpu)) {
 		emulate_gp(ctxt, 0);