Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b93d923 authored by Junaid Shahid's avatar Junaid Shahid Committed by Greg Kroah-Hartman
Browse files

kvm: mmu: Don't read PDPTEs when paging is not enabled 



[ Upstream commit d35b34a9a70edae7ef923f100e51b8b5ae9fe899 ]

kvm should not attempt to read guest PDPTEs when CR0.PG = 0 and
CR4.PAE = 1.

Signed-off-by: default avatarJunaid Shahid <junaids@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9829ecfd

arch/x86/kvm/x86.c

+2 −2
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ static bool pdptrs_changed(struct kvm_vcpu *vcpu) 
	gfn_t gfn;

	int r;



	if (is_long_mode(vcpu) || !is_pae(vcpu))

	if (is_long_mode(vcpu) || !is_pae(vcpu) || !is_paging(vcpu))

		return false;



	if (!test_bit(VCPU_EXREG_PDPTR,
@@ -7491,7 +7491,7 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu, 
		kvm_update_cpuid(vcpu);



	idx = srcu_read_lock(&vcpu->kvm->srcu);

	if (!is_long_mode(vcpu) && is_pae(vcpu)) {

	if (!is_long_mode(vcpu) && is_pae(vcpu) && is_paging(vcpu)) {

		load_pdptrs(vcpu, vcpu->arch.walk_mmu, kvm_read_cr3(vcpu));

		mmu_reset_needed = 1;

	}