Commit c30e000e authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86/mmu: Harden new PGD against roots without shadow pages 

Harden kvm_mmu_new_pgd() against NULL pointer dereference bugs by sanity
checking that the target root has an associated shadow page prior to
dereferencing said shadow page.  The code in question is guaranteed to
only see roots with shadow pages as fast_pgd_switch() explicitly frees the
current root if it doesn't have a shadow page, i.e. is a PAE root, and
that in turn prevents valid roots from being cached, but that's all very
subtle.

Link: https://lore.kernel.org/r/20230729005200.1057358-3-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c5f2d564

arch/x86/kvm/mmu/mmu.c

+19 −6
Original line number Diff line number Diff line
@@ -4527,9 +4527,19 @@ static void nonpaging_init_context(struct kvm_mmu *context) 
static inline bool is_root_usable(struct kvm_mmu_root_info *root, gpa_t pgd,

				  union kvm_mmu_page_role role)

{

	return (role.direct || pgd == root->pgd) &&

	       VALID_PAGE(root->hpa) &&

	       role.word == root_to_sp(root->hpa)->role.word;

	struct kvm_mmu_page *sp;



	if (!VALID_PAGE(root->hpa))

		return false;



	if (!role.direct && pgd != root->pgd)

		return false;



	sp = root_to_sp(root->hpa);

	if (WARN_ON_ONCE(!sp))

		return false;



	return role.word == sp->role.word;

}



/*
@@ -4649,9 +4659,12 @@ void kvm_mmu_new_pgd(struct kvm_vcpu *vcpu, gpa_t new_pgd) 
	 * If this is a direct root page, it doesn't have a write flooding

	 * count. Otherwise, clear the write flooding count.

	 */

	if (!new_role.direct)

		__clear_sp_write_flooding_count(

				root_to_sp(vcpu->arch.mmu->root.hpa));

	if (!new_role.direct) {

		struct kvm_mmu_page *sp = root_to_sp(vcpu->arch.mmu->root.hpa);



		if (!WARN_ON_ONCE(!sp))

			__clear_sp_write_flooding_count(sp);

	}

}

EXPORT_SYMBOL_GPL(kvm_mmu_new_pgd);