---

yaml --- r: 197683 b: refs/heads/master c: 6aebfa6 h: refs/heads/master i: 197681: e8be1d8 197679: 8857869 v: v3
git-mirror · May 17, 2010 · 376492f · 376492f
1 parent c245aa8
commit 376492f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab8557b2b361c8bb2e2421c791c8f6c4f6ba3d08
+refs/heads/master: 6aebfa6ea75f9a02a0339e733090dd40d6f2edfd
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
@@ -2520,6 +2520,13 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 		c->dst.type = OP_NONE;
 		break;
 	case 0x20: /* mov cr, reg */
+		switch (c->modrm_reg) {
+		case 1:
+		case 5 ... 7:
+		case 9 ... 15:
+			kvm_queue_exception(ctxt->vcpu, UD_VECTOR);
+			goto done;
+		}
 		c->regs[c->modrm_rm] = ops->get_cr(c->modrm_reg, ctxt->vcpu);
 		c->dst.type = OP_NONE;	/* no writeback */
 		break;