target/i386: Added consistency checks for event injection
PATCH 1/1 target/i386: Added consistency checks for event injection
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 <[email protected]>
--- target/i386/tcg/sysemu/svm_helper.c | 6 ++++++ 1 file changed, 6 insertions(+)
target/i386/tcg/sysemu/svm_helper.c +6 -0
@@ -395,6 +395,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 ;
@@ -410,6 +413,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);
Signature · 1 line
2.25.1
Paolo Bonzini
AppliedQuoted 28 lines · Lara Lazier
VMRUN exits with
SVM_EXIT_ERRif 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_injtest in kvm-unit-tests.Signed-off-by Lara Lazier <[email protected]>--- target/i386/tcg/sysemu/svm_helper.c | 6 ++++++ 1 file changed, 6 insertions(+)target/i386/tcg/sysemu/svm_helper.c +3
-0@@ -395,6 +395,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 ;
target/i386/tcg/sysemu/svm_helper.c void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) · line 421
Quoted 9 lines
target/i386/tcg/sysemu/svm_helper.c +3
-0@@ -410,6 +413,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);
Queued, thanks.
Paolo