Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dec5603 authored by Nadav Amit's avatar Nadav Amit Committed by Paolo Bonzini
Browse files

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: default avatarNadav Amit <namit@cs.technion.ac.il>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bc39c4db

arch/x86/kvm/emulate.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

	}