Skip to content

Commit 3977946

Browse files
Gavin Guogregkh
authored andcommitted
mm/huge_memory: fix dereferencing invalid pmd migration entry
commit be6e843 upstream. When migrating a THP, concurrent access to the PMD migration entry during a deferred split scan can lead to an invalid address access, as illustrated below. To prevent this invalid access, it is necessary to check the PMD migration entry and return early. In this context, there is no need to use pmd_to_swp_entry and pfn_swap_entry_to_page to verify the equality of the target folio. Since the PMD migration entry is locked, it cannot be served as the target. Mailing list discussion and explanation from Hugh Dickins: "An anon_vma lookup points to a location which may contain the folio of interest, but might instead contain another folio: and weeding out those other folios is precisely what the "folio != pmd_folio((*pmd)" check (and the "risk of replacing the wrong folio" comment a few lines above it) is for." BUG: unable to handle page fault for address: ffffea60001db008 CPU: 0 UID: 0 PID: 2199114 Comm: tee Not tainted 6.14.0+ #4 NONE Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2 04/01/2014 RIP: 0010:split_huge_pmd_locked+0x3b5/0x2b60 Call Trace: <TASK> try_to_migrate_one+0x28c/0x3730 rmap_walk_anon+0x4f6/0x770 unmap_folio+0x196/0x1f0 split_huge_page_to_list_to_order+0x9f6/0x1560 deferred_split_scan+0xac5/0x12a0 shrinker_debugfs_scan_write+0x376/0x470 full_proxy_write+0x15c/0x220 vfs_write+0x2fc/0xcb0 ksys_write+0x146/0x250 do_syscall_64+0x6a/0x120 entry_SYSCALL_64_after_hwframe+0x76/0x7e The bug is found by syzkaller on an internal kernel, then confirmed on upstream. Link: https://lkml.kernel.org/r/[email protected] Link: https://lore.kernel.org/all/[email protected]/ Link: https://lore.kernel.org/all/[email protected]/ Fixes: 84c3fc4 ("mm: thp: check pmd migration entry in common path") Signed-off-by: Gavin Guo <[email protected]> Acked-by: David Hildenbrand <[email protected]> Acked-by: Hugh Dickins <[email protected]> Acked-by: Zi Yan <[email protected]> Reviewed-by: Gavin Shan <[email protected]> Cc: Florent Revest <[email protected]> Cc: Matthew Wilcox (Oracle) <[email protected]> Cc: Miaohe Lin <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> [gavin: backport the migration checking logic to __split_huge_pmd] Signed-off-by: Gavin Guo <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent af6cfcd commit 3977946

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

mm/huge_memory.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2260,12 +2260,14 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
22602260
{
22612261
spinlock_t *ptl;
22622262
struct mmu_notifier_range range;
2263+
bool pmd_migration;
22632264

22642265
mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma->vm_mm,
22652266
address & HPAGE_PMD_MASK,
22662267
(address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE);
22672268
mmu_notifier_invalidate_range_start(&range);
22682269
ptl = pmd_lock(vma->vm_mm, pmd);
2270+
pmd_migration = is_pmd_migration_entry(*pmd);
22692271

22702272
/*
22712273
* If caller asks to setup a migration entry, we need a folio to check
@@ -2274,13 +2276,12 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
22742276
VM_BUG_ON(freeze && !folio);
22752277
VM_WARN_ON_ONCE(folio && !folio_test_locked(folio));
22762278

2277-
if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) ||
2278-
is_pmd_migration_entry(*pmd)) {
2279+
if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || pmd_migration) {
22792280
/*
2280-
* It's safe to call pmd_page when folio is set because it's
2281-
* guaranteed that pmd is present.
2281+
* Do not apply pmd_folio() to a migration entry; and folio lock
2282+
* guarantees that it must be of the wrong folio anyway.
22822283
*/
2283-
if (folio && folio != page_folio(pmd_page(*pmd)))
2284+
if (folio && (pmd_migration || folio != page_folio(pmd_page(*pmd))))
22842285
goto out;
22852286
__split_huge_pmd_locked(vma, pmd, range.start, freeze);
22862287
}

0 commit comments

Comments
 (0)