From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Lara Lazier <laramglazier@gmail.com>
Subject: [PULL 4/7] target/i386: Added consistency checks for event injection
Date: Thu, 29 Jul 2021 14:47:10 +0200 [thread overview]
Message-ID: <20210729124713.208422-5-pbonzini@redhat.com> (raw)
In-Reply-To: <20210729124713.208422-1-pbonzini@redhat.com>
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
next prev parent reply other threads:[~2021-07-29 12:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-29 12:47 [PULL 0/7] Misc patches for QEMU 6.1-rc2 Paolo Bonzini
2021-07-29 12:47 ` [PULL 1/7] i386: assert 'cs->kvm_state' is not null Paolo Bonzini
2021-07-29 12:47 ` [PULL 2/7] Makefile: ignore long options Paolo Bonzini
2021-07-29 12:47 ` [PULL 3/7] configure: Add -Werror to avx2, avx512 tests Paolo Bonzini
2021-07-29 12:47 ` Paolo Bonzini [this message]
2021-07-29 12:47 ` [PULL 5/7] target/i386: fix typo in ctl_has_irq Paolo Bonzini
2021-07-29 12:47 ` [PULL 6/7] meson: fix meson 0.58 warning with libvhost-user subproject Paolo Bonzini
2021-07-29 12:58 ` Peter Maydell
2021-07-29 14:05 ` Thomas Huth
2021-07-29 15:07 ` Peter Maydell
2021-07-29 16:50 ` 罗勇刚(Yonggang Luo)
2021-08-19 8:43 ` Christian Borntraeger
2021-08-19 14:51 ` Christian Borntraeger
2021-08-19 15:11 ` Christian Borntraeger
2021-07-29 12:47 ` [PULL 7/7] libvhost-user: fix -Werror=format= warnings with __u64 fields Paolo Bonzini
2021-07-29 17:48 ` [PULL 0/7] Misc patches for QEMU 6.1-rc2 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210729124713.208422-5-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=laramglazier@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).