Commit 32e94d06 authored Jun 02, 2014 by Nadav Amit Committed by Paolo Bonzini Jun 18, 2014

KVM: x86: smsw emulation is incorrect in 64-bit mode



In 64-bit mode, when the destination is a register, the assignment is done
according to the operand size. Otherwise (memory operand or no 64-bit mode), a
16-bit assignment is performed.

Currently, 16-bit assignment is always done to the destination.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent aaa05f24

arch/x86/kvm/emulate.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -3235,6 +3235,7 @@ static int em_lidt(struct x86_emulate_ctxt *ctxt)

		static int em_smsw(struct x86_emulate_ctxt *ctxt)
		{
		if (ctxt->dst.type == OP_MEM)
		ctxt->dst.bytes = 2;
		ctxt->dst.val = ctxt->ops->get_cr(ctxt, 0);
		return X86EMUL_CONTINUE;