diff options
| author | Paolo Bonzini | 2014-08-20 10:08:23 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2014-08-20 13:01:26 +0200 |
| commit | e0ad0b477c36fde6b0923670647495d07bf42f94 (patch) | |
| tree | 36b2efe539ed3bffea8e923962bbbd0bf968da21 /arch/x86 | |
| parent | KVM: emulate: do not return X86EMUL_PROPAGATE_FAULT explicitly (diff) | |
| download | kernel-qcow2-linux-e0ad0b477c36fde6b0923670647495d07bf42f94.tar.gz kernel-qcow2-linux-e0ad0b477c36fde6b0923670647495d07bf42f94.tar.xz kernel-qcow2-linux-e0ad0b477c36fde6b0923670647495d07bf42f94.zip | |
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: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 5 | ||||
| -rw-r--r-- | arch/x86/kvm/x86.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 4fbf4b598f92..e5bf13003cd2 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -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, u32 error, bool valid) { + WARN_ON(vec > 0x1f); ctxt->exception.vector = vec; ctxt->exception.error_code = error; ctxt->exception.error_code_valid = valid; @@ -4827,8 +4828,10 @@ writeback: ctxt->eip = ctxt->_eip; done: - if (rc == X86EMUL_PROPAGATE_FAULT) + if (rc == X86EMUL_PROPAGATE_FAULT) { + WARN_ON(ctxt->exception.vector > 0x1f); ctxt->have_exception = true; + } if (rc == X86EMUL_INTERCEPTED) return EMULATION_INTERCEPTED; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 737b4bdac41c..cd718c01cdf1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -5248,6 +5248,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, ctxt->interruptibility = 0; ctxt->have_exception = false; + ctxt->exception.vector = -1; ctxt->perm_ok = false; ctxt->ud = emulation_type & EMULTYPE_TRAP_UD; |