diff options
| author | Nadav Amit | 2014-06-15 15:12:57 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-06-19 12:52:08 +0200 |
| commit | 7dec5603b6b8dc4c3e1c65d318bd2a5a8c62a424 (patch) | |
| tree | 2a331fa1dfa9396bfec002c5fa839294adbe664d /arch/x86/kvm/emulate.c | |
| parent | arch/x86/kvm/vmx.c: use PAGE_ALIGNED instead of IS_ALIGNED(PAGE_SIZE (diff) | |
| download | kernel-qcow2-linux-7dec5603b6b8dc4c3e1c65d318bd2a5a8c62a424.tar.gz kernel-qcow2-linux-7dec5603b6b8dc4c3e1c65d318bd2a5a8c62a424.tar.xz kernel-qcow2-linux-7dec5603b6b8dc4c3e1c65d318bd2a5a8c62a424.zip | |
KVM: x86: bit-ops emulation ignores offset on 64-bit
The current emulation of bit operations ignores the offset from the destination
on 64-bit target memory operands. This patch fixes this behavior.
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, 3 insertions, 1 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 8a1796b1eef2..439a3286406a 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -1220,12 +1220,14 @@ static void fetch_bit_operand(struct x86_emulate_ctxt *ctxt) long sv = 0, mask; if (ctxt->dst.type == OP_MEM && ctxt->src.type == OP_REG) { - mask = ~(ctxt->dst.bytes * 8 - 1); + mask = ~((long)ctxt->dst.bytes * 8 - 1); if (ctxt->src.bytes == 2) sv = (s16)ctxt->src.val & (s16)mask; else if (ctxt->src.bytes == 4) sv = (s32)ctxt->src.val & (s32)mask; + else + sv = (s64)ctxt->src.val & (s64)mask; ctxt->dst.addr.mem.ea += (sv >> 3); } |