KVM: x86: set ctxt->have_exception in x86_decode_insn() (c8848cee) · Commits · 戴 / test

x86_emulate_instruction() takes into account ctxt->have_exception flag during instruction decoding, but in practice this flag is never set in x86_decode_insn(). Fixes: ("KVM: x86: inject exceptions produced by x86_decode_insn") Cc: stable@vger.kernel.org Cc: Denis Lunev <den@virtuozzo.com> Cc: Roman Kagan <rkagan@virtuozzo.com> Cc: Denis Plotnikov <dplotnikov@virtuozzo.com> Signed-off-by:

Jan Dakinevich <jan.dakinevich@virtuozzo.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/emulate.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -5416,6 +5416,8 @@ done_prefixes:
		ctxt->memopp->addr.mem.ea + ctxt->_eip);

		done:
		if (rc == X86EMUL_PROPAGATE_FAULT)
		ctxt->have_exception = true;
		return (rc != X86EMUL_CONTINUE) ? EMULATION_FAILED : EMULATION_OK;
		}

arch/x86/kvm/x86.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -6577,6 +6577,12 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
		emulation_type))
		return EMULATE_DONE;
		if (ctxt->have_exception) {
		/*
		* #UD should result in just EMULATION_FAILED, and trap-like
		* exception should not be encountered during decode.
		*/
		WARN_ON_ONCE(ctxt->exception.vector == UD_VECTOR \|\|
		exception_type(ctxt->exception.vector) == EXCPT_TRAP);
		inject_emulated_exception(vcpu);
		return EMULATE_DONE;
		}

Admin message