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

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

KVM: x86: CMOV emulation on legacy mode is wrong 



On legacy mode CMOV emulation should still clear bits [63:32] even if the
assignment is not done. The previous fix 140bad89 ("KVM: x86: emulation of
dword cmov on long-mode should clear [63:32]") was incomplete.

Signed-off-by: default avatarNadav Amit <namit@cs.technion.ac.il>
Message-Id: <1427719163-5429-2-git-send-email-namit@cs.technion.ac.il>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2dccb4cd

arch/x86/kvm/emulate.c

+1 −2
Original line number Diff line number Diff line
@@ -5126,8 +5126,7 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) 
	case 0x40 ... 0x4f:	/* cmov */

		if (test_cc(ctxt->b, ctxt->eflags))

			ctxt->dst.val = ctxt->src.val;

		else if (ctxt->mode != X86EMUL_MODE_PROT64 ||

			 ctxt->op_bytes != 4)

		else if (ctxt->op_bytes != 4)

			ctxt->dst.type = OP_NONE; /* no writeback */

		break;

	case 0x80 ... 0x8f: /* jnz rel, etc*/