Skip to content

Commit 08d72f7

Browse files
sean-jcrene
authored andcommitted
KVM: x86: Fix shadow paging use-after-free due to unexpected GFN
The shadow MMU computes GFNs for direct shadow pages using sp->gfn plus the SPTE index. This assumption breaks for shadow paging if the guest page tables are modified between VM entries (similar to commit aad885e77496, "KVM: x86/mmu: Drop/zap existing present SPTE even when creating an MMIO SPTE", 2026-03-27). The flow is as follows: - a PDE is installed for a 2MB mapping, and a page in that area is accessed. KVM creates a kvm_mmu_page consisting of 512 4KB pages; the kvm_mmu_page is marked by FNAME(fetch) as direct-mapped because the guest's mapping is a huge page (and thus contiguous). - the PDE mapping is changed from outside the guest. - the guest accesses another page in the same 2MB area. KVM installs a new leaf SPTE and rmap entry; the SPTE uses the "correct" GFN (i.e. based on the new mapping, as changed in the previous step) but that GFN is outside of the [sp->gfn, sp->gfn + 511] range; therefore the rmap entry cannot be found and removed when the kvm_mmu_page is zapped. - the memslot that covers the first 2MB mapping is deleted, and the kvm_mmu_page for the now-invalid GPA is zapped. However, rmap_remove() only looks at the [sp->gfn, sp->gfn + 511] range established in step 1, and fails to find the rmap entry that was recorded by step 3. - any operation that causes an rmap walk for the same page accessed by step 3 then walks a stale rmap and dereferences a freed kvm_mmu_page. This includes dirty logging or MMU notifier invalidations (e.g., from MADV_DONTNEED). The underlying issue is that KVM's walking of shadow PTEs assumes that if a SPTE is present when KVM wants to install a non-leaf SPTE, then the existing kvm_mmu_page must be for the correct gfn. Because the only way for the gfn to be wrong is if KVM messed up and failed to zap a SPTE... which shouldn't happen, but *actually* only happens in response to a guest write. That bug dates back literally forever, as even the first version of KVM assumes that the GFN matches and walks into the "wrong" shadow page. However, that was only an imprecision until 2032a93 ("KVM: MMU: Don't allocate gfns page for direct mmu pages") came along. Fix it by checking for a target gfn mismatch and zapping the existing SPTE. That way the old SP and rmap entries are gone, KVM installs the rmap in the right location, and everyone is happy. Fixes: 2032a93 ("KVM: MMU: Don't allocate gfns page for direct mmu pages") Fixes: 6aa8b73 ("kvm: userspace interface") Reported-by: Alexander Bulekov <bkov@amazon.com> Reported-by: Fred Griffoul <fgriffo@amazon.co.uk> Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson <seanjc@google.com> Link: https://patch.msgid.link/20260503201029.106481-1-pbonzini@redhat.com/ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit 0cb2af2ea66ad8ff195c156ea690f11216285bdf)
1 parent 452eaff commit 08d72f7

1 file changed

Lines changed: 14 additions & 21 deletions

File tree

  • kernel/kernel-noble/arch/x86/kvm/mmu

kernel/kernel-noble/arch/x86/kvm/mmu/mmu.c

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,8 @@ struct kmem_cache *mmu_page_header_cache;
182182
static struct percpu_counter kvm_total_used_mmu_pages;
183183

184184
static void mmu_spte_set(u64 *sptep, u64 spte);
185+
static int mmu_page_zap_pte(struct kvm *kvm, struct kvm_mmu_page *sp,
186+
u64 *spte, struct list_head *invalid_list);
185187

186188
struct kvm_mmu_role_regs {
187189
const unsigned long cr0;
@@ -1200,19 +1202,6 @@ static void drop_spte(struct kvm *kvm, u64 *sptep)
12001202
rmap_remove(kvm, sptep);
12011203
}
12021204

1203-
static void drop_large_spte(struct kvm *kvm, u64 *sptep, bool flush)
1204-
{
1205-
struct kvm_mmu_page *sp;
1206-
1207-
sp = sptep_to_sp(sptep);
1208-
WARN_ON_ONCE(sp->role.level == PG_LEVEL_4K);
1209-
1210-
drop_spte(kvm, sptep);
1211-
1212-
if (flush)
1213-
kvm_flush_remote_tlbs_sptep(kvm, sptep);
1214-
}
1215-
12161205
/*
12171206
* Write-protect on the specified @sptep, @pt_protect indicates whether
12181207
* spte write-protection is caused by protecting shadow page table.
@@ -2356,7 +2345,8 @@ static struct kvm_mmu_page *kvm_mmu_get_child_sp(struct kvm_vcpu *vcpu,
23562345
{
23572346
union kvm_mmu_page_role role;
23582347

2359-
if (is_shadow_present_pte(*sptep) && !is_large_pte(*sptep))
2348+
if (is_shadow_present_pte(*sptep) && !is_large_pte(*sptep) &&
2349+
spte_to_child_sp(*sptep) && spte_to_child_sp(*sptep)->gfn == gfn)
23602350
return ERR_PTR(-EEXIST);
23612351

23622352
role = kvm_mmu_child_role(sptep, direct, access);
@@ -2434,13 +2424,16 @@ static void __link_shadow_page(struct kvm *kvm,
24342424

24352425
BUILD_BUG_ON(VMX_EPT_WRITABLE_MASK != PT_WRITABLE_MASK);
24362426

2437-
/*
2438-
* If an SPTE is present already, it must be a leaf and therefore
2439-
* a large one. Drop it, and flush the TLB if needed, before
2440-
* installing sp.
2441-
*/
2442-
if (is_shadow_present_pte(*sptep))
2443-
drop_large_spte(kvm, sptep, flush);
2427+
if (is_shadow_present_pte(*sptep)) {
2428+
struct kvm_mmu_page *parent_sp;
2429+
LIST_HEAD(invalid_list);
2430+
2431+
parent_sp = sptep_to_sp(sptep);
2432+
WARN_ON_ONCE(parent_sp->role.level == PG_LEVEL_4K);
2433+
2434+
mmu_page_zap_pte(kvm, parent_sp, sptep, &invalid_list);
2435+
kvm_mmu_remote_flush_or_zap(kvm, &invalid_list, true);
2436+
}
24442437

24452438
spte = make_nonleaf_spte(sp->spt, sp_ad_disabled(sp));
24462439

0 commit comments

Comments
 (0)