diff options
| author | Nadav Amit | 2014-06-02 17:34:08 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-06-18 17:46:18 +0200 |
| commit | 3b32004a66e96e17d2a031c08d3304245c506dfc (patch) | |
| tree | 7d49f500c0793ad3ae29917c27794d4e306943b7 /arch/x86/kvm/emulate.c | |
| parent | KVM: x86: cmpxchg emulation should compare in reverse order (diff) | |
| download | kernel-qcow2-linux-3b32004a66e96e17d2a031c08d3304245c506dfc.tar.gz kernel-qcow2-linux-3b32004a66e96e17d2a031c08d3304245c506dfc.tar.xz kernel-qcow2-linux-3b32004a66e96e17d2a031c08d3304245c506dfc.zip | |
KVM: x86: movnti minimum op size of 32-bit is not kept
If the operand-size prefix (0x66) is used in 64-bit mode, the emulator would
assume the destination operand is 64-bit, when it should be 32-bit.
Reminder: movnti does not support 16-bit operands and its default operand size
is 32-bit.
Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/emulate.c')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 4cb0da660283..be3f7645e39d 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -4836,8 +4836,8 @@ twobyte_insn: break; case 0xc3: /* movnti */ ctxt->dst.bytes = ctxt->op_bytes; - ctxt->dst.val = (ctxt->op_bytes == 4) ? (u32) ctxt->src.val : - (u64) ctxt->src.val; + ctxt->dst.val = (ctxt->op_bytes == 8) ? (u64) ctxt->src.val : + (u32) ctxt->src.val; break; default: goto cannot_emulate; |