Skip to content

Commit 4432d1f

Browse files
committed
mm/migrate: fix shmem xarray update during migration
commit 60cf233 Author: Zi Yan <[email protected]> Date: Wed Mar 5 15:04:03 2025 -0500 mm/migrate: fix shmem xarray update during migration A shmem folio can be either in page cache or in swap cache, but not at the same time. Namely, once it is in swap cache, folio->mapping should be NULL, and the folio is no longer in a shmem mapping. In __folio_migrate_mapping(), to determine the number of xarray entries to update, folio_test_swapbacked() is used, but that conflates shmem in page cache case and shmem in swap cache case. It leads to xarray multi-index entry corruption, since it turns a sibling entry to a normal entry during xas_store() (see [1] for a userspace reproduction). Fix it by only using folio_test_swapcache() to determine whether xarray is storing swap cache entries or not to choose the right number of xarray entries to update. [1] https://lore.kernel.org/linux-mm/[email protected]/ Note: In __split_huge_page(), folio_test_anon() && folio_test_swapcache() is used to get swap_cache address space, but that ignores the shmem folio in swap cache case. It could lead to NULL pointer dereferencing when a in-swap-cache shmem folio is split at __xa_store(), since !folio_test_anon() is true and folio->mapping is NULL. But fortunately, its caller split_huge_page_to_list_to_order() bails out early with EBUSY when folio->mapping is NULL. So no need to take care of it here. Link: https://lkml.kernel.org/r/[email protected] Fixes: fc346d0 ("mm: migrate high-order folios in swap cache correctly") Signed-off-by: Zi Yan <[email protected]> Reported-by: Liu Shixin <[email protected]> Closes: https://lore.kernel.org/all/[email protected]/ Suggested-by: Hugh Dickins <[email protected]> Reviewed-by: Matthew Wilcox (Oracle) <[email protected]> Reviewed-by: Baolin Wang <[email protected]> Cc: Barry Song <[email protected]> Cc: Charan Teja Kalla <[email protected]> Cc: David Hildenbrand <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Kefeng Wang <[email protected]> Cc: Lance Yang <[email protected]> Cc: Ryan Roberts <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> CVE: CVE-2025-22015 JIRA: https://issues.redhat.com/browse/RHEL-77742 Signed-off-by: Nico Pache <[email protected]>
1 parent a87b765 commit 4432d1f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

mm/migrate.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -526,15 +526,13 @@ static int __folio_migrate_mapping(struct address_space *mapping,
526526
if (folio_test_anon(folio) && folio_test_large(folio))
527527
mod_mthp_stat(folio_order(folio), MTHP_STAT_NR_ANON, 1);
528528
folio_ref_add(newfolio, nr); /* add cache reference */
529-
if (folio_test_swapbacked(folio)) {
529+
if (folio_test_swapbacked(folio))
530530
__folio_set_swapbacked(newfolio);
531-
if (folio_test_swapcache(folio)) {
532-
folio_set_swapcache(newfolio);
533-
newfolio->private = folio_get_private(folio);
534-
}
531+
if (folio_test_swapcache(folio)) {
532+
folio_set_swapcache(newfolio);
533+
newfolio->private = folio_get_private(folio);
535534
entries = nr;
536535
} else {
537-
VM_BUG_ON_FOLIO(folio_test_swapcache(folio), folio);
538536
entries = 1;
539537
}
540538

0 commit comments

Comments
 (0)