mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
vvmx: check the operand of L1 vmxon
Check whether the operand of L1 vmxon is a valid VMXON region address and whether the VMXON region at that address contains a valid revision ID. Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com> Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Acked-by: Kevin Tian <kevin.tian@intel.com>
This commit is contained in:
1 parent
c88da9ec88
commit
08fac63ec0
1 file changed
+16
@@ -1373,6 +1373,7 @@ int nvmx_handle_vmxon(struct cpu_user_regs *regs)
|
||||
struct nestedvcpu *nvcpu = &vcpu_nestedhvm(v);
|
||||
struct vmx_inst_decoded decode;
|
||||
unsigned long gpa = 0;
|
||||
uint32_t nvmcs_revid;
|
||||
int rc;
|
||||
|
||||
rc = decode_vmx_inst(regs, &decode, &gpa, 1);
|
||||
@@ -1387,6 +1388,21 @@ int nvmx_handle_vmxon(struct cpu_user_regs *regs)
|
||||
return X86EMUL_OKAY;
|
||||
}
|
||||
|
||||
if ( (gpa & ~PAGE_MASK) || (gpa >> v->domain->arch.paging.gfn_bits) )
|
||||
{
|
||||
vmreturn(regs, VMFAIL_INVALID);
|
||||
return X86EMUL_OKAY;
|
||||
}
|
||||
|
||||
rc = hvm_copy_from_guest_phys(&nvmcs_revid, gpa, sizeof(nvmcs_revid));
|
||||
if ( rc != HVMCOPY_okay ||
|
||||
(nvmcs_revid & ~VMX_BASIC_REVISION_MASK) ||
|
||||
((nvmcs_revid ^ vmx_basic_msr) & VMX_BASIC_REVISION_MASK) )
|
||||
{
|
||||
vmreturn(regs, VMFAIL_INVALID);
|
||||
return X86EMUL_OKAY;
|
||||
}
|
||||
|
||||
nvmx->vmxon_region_pa = gpa;
|
||||
|
||||
/*
|
||||
|
||||