Skip to content

Commit f17154e

Browse files
bonziniPlaidCat
authored andcommitted
KVM: x86: Fix shadow paging use-after-free due to unexpected role
cve CVE-2026-53359 commit-author Paolo Bonzini <pbonzini@redhat.com> commit 81ccda3 Commit 0cb2af2 ("KVM: x86: Fix shadow paging use-after-free due to unexpected GFN") fixed a shadow paging mismatch between stored and computed GFNs; the bug could be triggered by changing a PDE mapping from outside the guest, and then deleting a memslot. The rmap_remove() call would miss entries created after the PDE change because the GFN of the leaf SPTE does not match the GFN of the struct kvm_mmu_page. A similar hole however remains if the modified PDE points to a non-leaf page. In this case the gfn can be made to match, but the role does not match: the original large 2MB page creates a kvm_mmu_page with direct=1, while the new 4KB needs a kvm_mmu_page with direct=0. However, kvm_mmu_get_child_sp() does not compare the role, and therefore reuses the page. The next step is installing a leaf (4KB) SPTE on the new path which records an rmap entry under the gfn resolved by the walk. But when that child is zapped its parent kvm_mmu_page has direct=1 and kvm_mmu_page_get_gfn() computes the gfn for the 4KB page as sp->gfn + index instead of using sp->shadowed_translation[] (or sp->gfns[] in older kernels). It therefore fails to remove the recorded entry. When the memslot is dropped the shadow page is freed but the rmap entry survives, as in the scenario that was already fixed. Code that later walks that gfn (dirty logging, MMU notifier invalidation, and so on) dereferences an sptep that lies in the freed page, causing the use-after-free. Fixes: 2032a93 ("KVM: MMU: Don't allocate gfns page for direct mmu pages") Reported-by: Hyunwoo Kim <imv4bel@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> (cherry picked from commit 81ccda3) Signed-off-by: Shreeya Patel <spatel@ciq.com>
1 parent b10efb6 commit f17154e

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

arch/x86/kvm/mmu/mmu.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,13 +2315,15 @@ static struct kvm_mmu_page *kvm_mmu_get_child_sp(struct kvm_vcpu *vcpu,
23152315
u64 *sptep, gfn_t gfn,
23162316
bool direct, unsigned int access)
23172317
{
2318-
union kvm_mmu_page_role role;
2318+
union kvm_mmu_page_role role = kvm_mmu_child_role(sptep, direct, access);
23192319

2320-
if (is_shadow_present_pte(*sptep) && !is_large_pte(*sptep) &&
2321-
spte_to_child_sp(*sptep) && spte_to_child_sp(*sptep)->gfn == gfn)
2320+
if (is_shadow_present_pte(*sptep) &&
2321+
!is_large_pte(*sptep) &&
2322+
spte_to_child_sp(*sptep) &&
2323+
spte_to_child_sp(*sptep)->gfn == gfn &&
2324+
spte_to_child_sp(*sptep)->role.word == role.word)
23222325
return ERR_PTR(-EEXIST);
23232326

2324-
role = kvm_mmu_child_role(sptep, direct, access);
23252327
return kvm_mmu_get_shadow_page(vcpu, gfn, role);
23262328
}
23272329

0 commit comments

Comments
 (0)