]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
KVM: x86/mmu: avoid NULL-pointer dereference on page freeing bugs
authorPaolo Bonzini <pbonzini@redhat.com>
Wed, 9 Feb 2022 00:08:33 +0000 (19:08 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 May 2022 10:25:44 +0000 (12:25 +0200)
[ Upstream commit 9191b8f0745e63edf519e4a54a4aaae1d3d46fbd ]

WARN and bail if KVM attempts to free a root that isn't backed by a shadow
page.  KVM allocates a bare page for "special" roots, e.g. when using PAE
paging or shadowing 2/3/4-level page tables with 4/5-level, and so root_hpa
will be valid but won't be backed by a shadow page.  It's all too easy to
blindly call mmu_free_root_page() on root_hpa, be nice and WARN instead of
crashing KVM and possibly the kernel.

Reviewed-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/kvm/mmu/mmu.c

index 99ea1ec12ffe0b48da5afc7ec838c87d5b72c89a..70ef5b542681cb08fc2e56cfe350d78292488032 100644 (file)
@@ -3140,6 +3140,8 @@ static void mmu_free_root_page(struct kvm *kvm, hpa_t *root_hpa,
                return;
 
        sp = to_shadow_page(*root_hpa & PT64_BASE_ADDR_MASK);
+       if (WARN_ON(!sp))
+               return;
 
        if (kvm_mmu_put_root(kvm, sp)) {
                if (sp->tdp_mmu_page)