target/i386: Added consistency checks for CR3
PATCH 1/1 target/i386: Added consistency checks for CR3
All MBZ in CR3 must be zero (APM2 15.5)
Added checks in both helper_vmrun and helper_write_crN. When EFER.LMA is zero the upper 32 bits needs to be zeroed.
Signed-off-by Lara Lazier <[email protected]>
--- target/i386/tcg/sysemu/misc_helper.c | 7 +++++++ target/i386/tcg/sysemu/svm_helper.c | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)
target/i386/tcg/sysemu/misc_helper.c +7 -0
@@ -96,6 +96,13 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0)cpu_x86_update_cr0 (env, t0);break ;case 3 : +if ((env->efer &MSR_EFER_LMA ) && + (t0 & ((~0UL ) <<env_archcpu (env)->phys_bits))) { +cpu_vmexit (env,SVM_EXIT_ERR ,0 ,GETPC ()); + } +if (!(env->efer &MSR_EFER_LMA )) { + t0 &=0xffffffffUL ; + }cpu_x86_update_cr3 (env, t0);break ;case 4 :
target/i386/tcg/sysemu/svm_helper.c +7 -3
@@ -111,6 +111,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend)uint32_t int_ctl;uint32_t asid;uint64_t new_cr0; +uint64_t new_cr3;uint64_t new_cr4;cpu_svm_check_intercept_param (env,SVM_EXIT_VMRUN ,0 ,GETPC ());
@@ -252,6 +253,11 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend)if ((new_cr0 &CR0_NW_MASK ) && !(new_cr0 &CR0_CD_MASK )) {cpu_vmexit (env,SVM_EXIT_ERR ,0 ,GETPC ()); } + new_cr3 = x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.cr3)); +if ((env->efer &MSR_EFER_LMA ) && + (new_cr3 & ((~0UL ) << cpu->phys_bits))) { +cpu_vmexit (env,SVM_EXIT_ERR ,0 ,GETPC ()); + } new_cr4 = x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.cr4));if (new_cr4 &cr4_reserved_bits (env)) {cpu_vmexit (env,SVM_EXIT_ERR ,0 ,GETPC ());
@@ -262,9 +268,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend)cpu_x86_update_cr0 (env, new_cr0);cpu_x86_update_cr4 (env, new_cr4); -cpu_x86_update_cr3 (env,x86_ldq_phys (cs, - env->vm_vmcb + offsetof(struct vmcb , - save.cr3))); +cpu_x86_update_cr3 (env, new_cr3); env->cr[2 ] =x86_ldq_phys (cs, env->vm_vmcb + offsetof(struct vmcb, save.cr2)); int_ctl = x86_ldl_phys(cs,
Signature · 1 line
2.25.1
Paolo Bonzini
AppliedQuoted 54 lines · Lara Lazier
All MBZ in CR3 must be zero (APM2 15.5)
Added checks in bothhelper_vmrunandhelper_write_crN. When EFER.LMA is zero the upper 32 bits needs to be zeroed.Signed-off-by Lara Lazier <[email protected]>--- target/i386/tcg/sysemu/misc_helper.c | 7 +++++++ target/i386/tcg/sysemu/svm_helper.c | 10 +++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)target/i386/tcg/sysemu/misc_helper.c +7
-0@@ -96,6 +96,13 @@ void helper_write_crN(CPUX86State *env, int reg, target_ulong t0)cpu_x86_update_cr0 (env, t0);break ;case 3 : +if ((env->efer &MSR_EFER_LMA ) && + (t0 & ((~0UL ) <<env_archcpu (env)->phys_bits))) { +cpu_vmexit (env,SVM_EXIT_ERR ,0 ,GETPC ()); + } +if (!(env->efer &MSR_EFER_LMA )) { + t0 &=0xffffffffUL ; + }cpu_x86_update_cr3 (env, t0);break ;case 4 :target/i386/tcg/sysemu/svm_helper.c +6
-0@@ -111,6 +111,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend)uint32_t int_ctl;uint32_t asid;uint64_t new_cr0; +uint64_t new_cr3;uint64_t new_cr4;cpu_svm_check_intercept_param (env,SVM_EXIT_VMRUN ,0 ,GETPC ());@@ -252,6 +253,11 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend)if ((new_cr0 &CR0_NW_MASK ) && !(new_cr0 &CR0_CD_MASK )) {cpu_vmexit (env,SVM_EXIT_ERR ,0 ,GETPC ()); } + new_cr3 = x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.cr3)); +if ((env->efer &MSR_EFER_LMA ) && + (new_cr3 & ((~0UL ) << cpu->phys_bits))) { +cpu_vmexit (env,SVM_EXIT_ERR ,0 ,GETPC ()); + } new_cr4 = x86_ldq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, save.cr4));if (new_cr4 &cr4_reserved_bits (env)) {cpu_vmexit (env,SVM_EXIT_ERR ,0 ,GETPC ());
target/i386/tcg/sysemu/svm_helper.c void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend) · line 274
Quoted 10 lines
target/i386/tcg/sysemu/svm_helper.c +1
-3@@ -262,9 +268,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend)cpu_x86_update_cr0 (env, new_cr0);cpu_x86_update_cr4 (env, new_cr4); -cpu_x86_update_cr3 (env,x86_ldq_phys (cs, - env->vm_vmcb + offsetof(struct vmcb , - save.cr3))); +cpu_x86_update_cr3 (env, new_cr3); env->cr[2 ] =x86_ldq_phys (cs, env->vm_vmcb + offsetof(struct vmcb, save.cr2)); int_ctl = x86_ldl_phys(cs,
Queued, thanks.
Paolo