diff options
| author | Gleb Natapov <gleb@redhat.com> | 2010-03-18 15:20:14 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-05-17 12:16:11 +0300 |
| commit | a41ffb7540cb37426759e688083502d6463421b2 (patch) | |
| tree | ed71c38eb0af69cfbb412a1a6a0e8c1221b6c66d | |
| parent | fd5253658b403d51fc19e56ecb44c54a3071fded (diff) | |
| download | linux-stable-a41ffb7540cb37426759e688083502d6463421b2.tar.gz linux-stable-a41ffb7540cb37426759e688083502d6463421b2.tar.bz2 linux-stable-a41ffb7540cb37426759e688083502d6463421b2.zip | |
KVM: x86 emulator: If LOCK prefix is used dest arg should be memory.
If LOCK prefix is used dest arg should be memory, otherwise instruction
should generate #UD.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | arch/x86/kvm/emulate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index b89a8f217332..46a7ee3040a0 100644 --- a/arch/x86/kvm/emulate.c +++ b/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; } |