[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/7] target/i386: Added consistency checks for event injection
From: |
Paolo Bonzini |
Subject: |
[PULL 4/7] target/i386: Added consistency checks for event injection |
Date: |
Thu, 29 Jul 2021 14:47:10 +0200 |
From: Lara Lazier <laramglazier@gmail.com>
VMRUN exits with SVM_EXIT_ERR if either:
* The event injected has a reserved type.
* When the event injected is of type 3 (exception), and the vector that
has been specified does not correspond to an exception.
This does not fix the entire exc_inj test in kvm-unit-tests.
Signed-off-by: Lara Lazier <laramglazier@gmail.com>
Message-Id: <20210725090855.19713-1-laramglazier@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/tcg/sysemu/svm_helper.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/target/i386/tcg/sysemu/svm_helper.c
b/target/i386/tcg/sysemu/svm_helper.c
index 145511d635..90a9de30f8 100644
--- a/target/i386/tcg/sysemu/svm_helper.c
+++ b/target/i386/tcg/sysemu/svm_helper.c
@@ -383,6 +383,9 @@ void helper_vmrun(CPUX86State *env, int aflag, int
next_eip_addend)
cpu_loop_exit(cs);
break;
case SVM_EVTINJ_TYPE_EXEPT:
+ if (vector == EXCP02_NMI || vector >= 31) {
+ cpu_vmexit(env, SVM_EXIT_ERR, 0, GETPC());
+ }
cs->exception_index = vector;
env->error_code = event_inj_err;
env->exception_is_int = 0;
@@ -398,6 +401,9 @@ void helper_vmrun(CPUX86State *env, int aflag, int
next_eip_addend)
qemu_log_mask(CPU_LOG_TB_IN_ASM, "SOFT");
cpu_loop_exit(cs);
break;
+ default:
+ cpu_vmexit(env, SVM_EXIT_ERR, 0, GETPC());
+ break;
}
qemu_log_mask(CPU_LOG_TB_IN_ASM, " %#x %#x\n", cs->exception_index,
env->error_code);
--
2.31.1
- [PULL 0/7] Misc patches for QEMU 6.1-rc2, Paolo Bonzini, 2021/07/29
- [PULL 1/7] i386: assert 'cs->kvm_state' is not null, Paolo Bonzini, 2021/07/29
- [PULL 2/7] Makefile: ignore long options, Paolo Bonzini, 2021/07/29
- [PULL 3/7] configure: Add -Werror to avx2, avx512 tests, Paolo Bonzini, 2021/07/29
- [PULL 4/7] target/i386: Added consistency checks for event injection,
Paolo Bonzini <=
- [PULL 5/7] target/i386: fix typo in ctl_has_irq, Paolo Bonzini, 2021/07/29
- [PULL 6/7] meson: fix meson 0.58 warning with libvhost-user subproject, Paolo Bonzini, 2021/07/29
[PULL 7/7] libvhost-user: fix -Werror=format= warnings with __u64 fields, Paolo Bonzini, 2021/07/29
Re: [PULL 0/7] Misc patches for QEMU 6.1-rc2, Peter Maydell, 2021/07/29