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

Commit 12fa272e authored by Nitin A Kamble's avatar Nitin A Kamble Committed by Avi Kivity
Browse files

KVM: x86 emulator: fix src, dst value initialization 



Some operand fetches are less than the machine word size and can result in
stale bits if used together with operands of different sizes.

Signed-off-by: default avatarNitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 26a3e983

drivers/kvm/x86_emulate.c

+2 −0
Original line number Diff line number Diff line
@@ -827,6 +827,7 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
	      srcmem_common:

		src.type = OP_MEM;

		src.ptr = (unsigned long *)cr2;

		src.val = 0;

		if ((rc = ops->read_emulated((unsigned long)src.ptr,

					     &src.val, src.bytes, ctxt->vcpu)) != 0)

			goto done;
@@ -891,6 +892,7 @@ x86_emulate_memop(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) 
		dst.type = OP_MEM;

		dst.ptr = (unsigned long *)cr2;

		dst.bytes = (d & ByteOp) ? 1 : op_bytes;

		dst.val = 0;

		if (d & BitOp) {

			unsigned long mask = ~(dst.bytes * 8 - 1);