Skip to contentSkip to conversation

mm-khugepaged-fix-invalid-page-access-in-release_pte_pages.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Feb 13, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/khugepaged: fix invalid page access in release_pte_pages()
has been removed from the -mm tree. Its filename was
mm-khugepaged-fix-invalid-page-access-in-release_pte_pages.patch

This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: "Vishal Moola (Oracle)" <[email protected]>
Subject: mm/khugepaged: fix invalid page access in release_pte_pages()
Date: Mon, 13 Feb 2023 13:43:24 -0800

release_pte_pages() converts from a pfn to a folio by using pfn_folio(). If the pte is not mapped, pfn_folio() will result in undefined behavior which ends up causing a kernel panic[1].

Only call pfn_folio() once we have validated that the pte is both valid and mapped to fix the issue.

[1] https://lore.kernel.org/linux-mm/[email protected]/

---

mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-fix-invalid-page-access-in-release_pte_pages +10 -4
@@ -511,11 +511,17 @@ static void release_pte_pages(pte_t *pte
 
 	while (--_pte >= pte) {
 		pte_t pteval = *_pte;
+		unsigned long pfn;
 
-		folio = pfn_folio(pte_pfn(pteval));
-		if (!pte_none(pteval) && !is_zero_pfn(pte_pfn(pteval)) &&
-				!folio_test_large(folio))
-			release_pte_folio(folio);
+		if (pte_none(pteval))
+			continue;
+		pfn = pte_pfn(pteval);
+		if (is_zero_pfn(pfn))
+			continue;
+		folio = pfn_folio(pfn);
+		if (folio_test_large(folio))
+			continue;
+		release_pte_folio(folio);
 	}
 
 	list_for_each_entry_safe(folio, tmp, compound_pagelist, lru) {

_

Patches currently in -mm which might be from [email protected] are