Commit e0ad0b47 authored by Paolo Bonzini's avatar Paolo Bonzini

KVM: emulate: warn on invalid or uninitialized exception numbers

These were reported when running Jailhouse on AMD processors.

Initialize ctxt->exception.vector with an invalid exception number,
and warn if it remained invalid even though the emulator got
an X86EMUL_PROPAGATE_FAULT return code.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 592f0858
...@@ -527,6 +527,7 @@ static unsigned long seg_base(struct x86_emulate_ctxt *ctxt, int seg) ...@@ -527,6 +527,7 @@ static unsigned long seg_base(struct x86_emulate_ctxt *ctxt, int seg)
static int emulate_exception(struct x86_emulate_ctxt *ctxt, int vec, static int emulate_exception(struct x86_emulate_ctxt *ctxt, int vec,
u32 error, bool valid) u32 error, bool valid)
{ {
WARN_ON(vec > 0x1f);
ctxt->exception.vector = vec; ctxt->exception.vector = vec;
ctxt->exception.error_code = error; ctxt->exception.error_code = error;
ctxt->exception.error_code_valid = valid; ctxt->exception.error_code_valid = valid;
...@@ -4827,8 +4828,10 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt) ...@@ -4827,8 +4828,10 @@ int x86_emulate_insn(struct x86_emulate_ctxt *ctxt)
ctxt->eip = ctxt->_eip; ctxt->eip = ctxt->_eip;
done: done:
if (rc == X86EMUL_PROPAGATE_FAULT) if (rc == X86EMUL_PROPAGATE_FAULT) {
WARN_ON(ctxt->exception.vector > 0x1f);
ctxt->have_exception = true; ctxt->have_exception = true;
}
if (rc == X86EMUL_INTERCEPTED) if (rc == X86EMUL_INTERCEPTED)
return EMULATION_INTERCEPTED; return EMULATION_INTERCEPTED;
......
...@@ -5248,6 +5248,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, ...@@ -5248,6 +5248,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
ctxt->interruptibility = 0; ctxt->interruptibility = 0;
ctxt->have_exception = false; ctxt->have_exception = false;
ctxt->exception.vector = -1;
ctxt->perm_ok = false; ctxt->perm_ok = false;
ctxt->ud = emulation_type & EMULTYPE_TRAP_UD; ctxt->ud = emulation_type & EMULTYPE_TRAP_UD;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment