Linux kernel -stable discussions
 help / color / mirror / Atom feed
* [PATCH] mm/khugepaged: mark a collapsed mTHP dirty
@ 2026-11-17  7:52 Daniel Wade
  2026-11-17  8:13 ` David Hildenbrand (Arm)
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel Wade @ 2026-11-17  7:52 UTC (permalink / raw)
  To: David Hildenbrand, Zi Yan, Andrew Morton
  Cc: Baolin Wang, Liam R . Howlett, Nico Pache, Ryan Roberts, Dev Jain,
	Barry Song, Lance Yang, Usama Arif, Kiryl Shutsemau, linux-mm,
	linux-kernel, stable

When khugepaged collapses an anonymous range into a folio below PMD
size, collapse_huge_page() copies the pages in, but
map_anon_folio_pte_nopf() marks the PTEs dirty only when the VMA has
VM_WRITE and nothing marks the folio itself dirty. After
mprotect(PROT_READ) the folio therefore holds the only copy of the data
while looking clean, so MADV_FREE in one mapping marks it lazyfree,
reclaim frees it, and another process that maps it reads zeroes. Mark
the folio dirty before mapping it.

Found by static analysis with an AI coding assistant and reproduced with
a test program on an unmodified kernel.

Fixes: e22f2fe72c74 ("mm/khugepaged: generalize collapse_huge_page for mTHP collapse")
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Wade <danjwade95@gmail.com>
---
Claude (claude-mythos-5-2) found the bug and wrote the fix, this
description and the test program, which is available on request.

Tested on b3dfbde62cf1 with KASAN and lockdep: as uid 65534, write
64 KiB, mprotect(PROT_READ), wait for khugepaged, fork, MADV_FREE in
the parent. Unpatched the child reads 65536 wrong bytes; patched it is
intact.

 mm/khugepaged.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index 4bbe319..8a81cab 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -1422,6 +1422,11 @@ static enum scan_result collapse_huge_page(struct mm_struct *mm,
 		if (pte_ptl != pmd_ptl)
 			spin_lock_nested(pte_ptl, SINGLE_DEPTH_NESTING);
 		pmd_populate(mm, pmd, pmd_pgtable(_pmd));
+		/*
+		 * The PTEs are clean in a read-only VMA, but the folio holds
+		 * copied data: mark it dirty so reclaim cannot drop it.
+		 */
+		folio_set_dirty(folio);
 		map_anon_folio_pte_nopf(folio, pte, vma, start_addr,
 					  /*uffd_wp=*/ false);
 		if (pte_ptl != pmd_ptl)

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-17  8:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-17  7:52 [PATCH] mm/khugepaged: mark a collapsed mTHP dirty Daniel Wade
2026-11-17  8:13 ` David Hildenbrand (Arm)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox