github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-25 23:13:26 +00:00
Code Issues Projects Releases Wiki Activity

hv: nested: redundant permission check on nested_vmentry()

Browse Source 
check_vmx_permission() is called in vmresume_vmexit_handler() and
vmlaunch_vmexit_handler() already.

Tracked-On: #6289
Signed-off-by: Zide Chen <zide.chen@intel.com>
This commit is contained in:
Zide Chen 2021-08-18 22:40:16 -07:00 committed by wenlingz
parent d575edf79a
commit ad37553873
1 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/arch/x86/guest/nested.c
View File

@ -1409,7 +1409,6 @@ static void nested_vmentry(struct acrn_vcpu *vcpu, bool is_launch)
{ {
struct acrn_vmcs12 *vmcs12 = &vcpu->arch.nested.vmcs12; struct acrn_vmcs12 *vmcs12 = &vcpu->arch.nested.vmcs12;
if (check_vmx_permission(vcpu)) {
if (vcpu->arch.nested.current_vmcs12_ptr == INVALID_GPA) { if (vcpu->arch.nested.current_vmcs12_ptr == INVALID_GPA) {
nested_vmx_result(VMfailInvalid, 0); nested_vmx_result(VMfailInvalid, 0);
} else if (is_launch && (vmcs12->launch_state != VMCS12_LAUNCH_STATE_CLEAR)) { } else if (is_launch && (vmcs12->launch_state != VMCS12_LAUNCH_STATE_CLEAR)) {
@ -1456,7 +1455,6 @@ static void nested_vmentry(struct acrn_vcpu *vcpu, bool is_launch)
vcpu->launched = false; vcpu->launched = false;
} }
} }
}
/* /*
* @pre vcpu != NULL * @pre vcpu != NULL