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

KVM: x86: em_call_far should return failure result 



Currently, if em_call_far fails it returns success instead of the resulting
error-code. Fix it.

Signed-off-by: default avatarNadav Amit <namit@cs.technion.ac.il>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3dc4bc4f

arch/x86/kvm/emulate.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3027,7 +3027,7 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt) 
	rc = __load_segment_descriptor(ctxt, sel, VCPU_SREG_CS, cpl,

	rc = __load_segment_descriptor(ctxt, sel, VCPU_SREG_CS, cpl,

				       X86_TRANSFER_CALL_JMP, &new_desc);

				       X86_TRANSFER_CALL_JMP, &new_desc);

	if (rc != X86EMUL_CONTINUE)

	if (rc != X86EMUL_CONTINUE)

		return X86EMUL_CONTINUE;

		return rc;





	rc = assign_eip_far(ctxt, ctxt->src.val, &new_desc);

	rc = assign_eip_far(ctxt, ctxt->src.val, &new_desc);

	if (rc != X86EMUL_CONTINUE)

	if (rc != X86EMUL_CONTINUE)