Skip to content

Commit 1dbf5d6

Browse files
Mohammed Gamalbonzini
authored andcommitted
KVM: VMX: Add guest physical address check in EPT violation and misconfig
Check guest physical address against its maximum, which depends on the guest MAXPHYADDR. If the guest's physical address exceeds the maximum (i.e. has reserved bits set), inject a guest page fault with PFERR_RSVD_MASK set. This has to be done both in the EPT violation and page fault paths, as there are complications in both cases with respect to the computation of the correct error code. For EPT violations, unfortunately the only possibility is to emulate, because the access type in the exit qualification might refer to an access to a paging structure, rather than to the access performed by the program. Trapping page faults instead is needed in order to correct the error code, but the access type can be obtained from the original error code and passed to gva_to_gpa. The corrections required in the error code are subtle. For example, imagine that a PTE for a supervisor page has a reserved bit set. On a supervisor-mode access, the EPT violation path would trigger. However, on a user-mode access, the processor will not notice the reserved bit and not include PFERR_RSVD_MASK in the error code. Co-developed-by: Mohammed Gamal <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent a0c1343 commit 1dbf5d6

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

arch/x86/kvm/vmx/vmx.c

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4791,9 +4791,15 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu)
47914791

47924792
if (is_page_fault(intr_info)) {
47934793
cr2 = vmx_get_exit_qual(vcpu);
4794-
/* EPT won't cause page fault directly */
4795-
WARN_ON_ONCE(!vcpu->arch.apf.host_apf_flags && enable_ept);
4796-
return kvm_handle_page_fault(vcpu, error_code, cr2, NULL, 0);
4794+
if (enable_ept && !vcpu->arch.apf.host_apf_flags) {
4795+
/*
4796+
* EPT will cause page fault only if we need to
4797+
* detect illegal GPAs.
4798+
*/
4799+
kvm_fixup_and_inject_pf_error(vcpu, cr2, error_code);
4800+
return 1;
4801+
} else
4802+
return kvm_handle_page_fault(vcpu, error_code, cr2, NULL, 0);
47974803
}
47984804

47994805
ex_no = intr_info & INTR_INFO_VECTOR_MASK;
@@ -5309,6 +5315,18 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu)
53095315
PFERR_GUEST_FINAL_MASK : PFERR_GUEST_PAGE_MASK;
53105316

53115317
vcpu->arch.exit_qualification = exit_qualification;
5318+
5319+
/*
5320+
* Check that the GPA doesn't exceed physical memory limits, as that is
5321+
* a guest page fault. We have to emulate the instruction here, because
5322+
* if the illegal address is that of a paging structure, then
5323+
* EPT_VIOLATION_ACC_WRITE bit is set. Alternatively, if supported we
5324+
* would also use advanced VM-exit information for EPT violations to
5325+
* reconstruct the page fault error code.
5326+
*/
5327+
if (unlikely(kvm_mmu_is_illegal_gpa(vcpu, gpa)))
5328+
return kvm_emulate_instruction(vcpu, 0);
5329+
53125330
return kvm_mmu_page_fault(vcpu, gpa, error_code, NULL, 0);
53135331
}
53145332

arch/x86/kvm/vmx/vmx.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "kvm_cache_regs.h"
1212
#include "ops.h"
1313
#include "vmcs.h"
14+
#include "cpuid.h"
1415

1516
extern const u32 vmx_msr_index[];
1617

@@ -552,7 +553,7 @@ static inline bool vmx_has_waitpkg(struct vcpu_vmx *vmx)
552553

553554
static inline bool vmx_need_pf_intercept(struct kvm_vcpu *vcpu)
554555
{
555-
return !enable_ept;
556+
return !enable_ept || cpuid_maxphyaddr(vcpu) < boot_cpu_data.x86_phys_bits;
556557
}
557558

558559
void dump_vmcs(void);

0 commit comments

Comments
 (0)