---

yaml --- r: 197687 b: refs/heads/master c: a41ffb7 h: refs/heads/master i: 197685: 01c8f62 197683: 376492f 197679: 8857869 v: v3
git-mirror · May 17, 2010 · 09856c2 · 09856c2
1 parent dd0ab7f
commit 09856c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd5253658b403d51fc19e56ecb44c54a3071fded
+refs/heads/master: a41ffb7540cb37426759e688083502d6463421b2
diff --git a/trunk/arch/x86/kvm/emulate.c b/trunk/arch/x86/kvm/emulate.c
@@ -1842,7 +1842,7 @@ x86_emulate_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops)
 	}
 
 	/* LOCK prefix is allowed only with some instructions */
-	if (c->lock_prefix && !(c->d & Lock)) {
+	if (c->lock_prefix && (!(c->d & Lock) || c->dst.type != OP_MEM)) {
 		kvm_queue_exception(ctxt->vcpu, UD_VECTOR);
 		goto done;
 	}