Skip to contentSkip to conversation

mm/khugepaged: Fix invalid page access in release_pte_pages()

PATCH Applied Vishal Moola (Oracle) 5 participants 5 messages Feb 13, 2023 – Feb 14, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mm/khugepaged: Fix invalid page access in release_pte_pages()

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]/

Fixes 9bdfeea46f49 ("mm/khugepaged: convert release_pte_pages() to use folios")
Cc Matthew Wilcox <[email protected]>
---
 mm/khugepaged.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
mm/khugepaged.c +10 -4
index b39ab219d5b7..bd54b957f69a 100644
@@ -511,11 +511,17 @@ static void release_pte_pages(pte_t *pte, 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) {
Signature · 1 line
2.39.1
Tested-by on v1 1/1
#1 lore raw
Quoted 7 lines · Vishal Moola (Oracle)

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.

Quoted 7 lines

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

Fixes 9bdfeea46f49 ("mm/khugepaged: convert release_pte_pages() to use folios")
Cc Matthew Wilcox <[email protected]>
Quoted 20 lines
---
  mm/khugepaged.c | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
mm/khugepaged.c +3 -4
index b39ab219d5b7..bd54b957f69a 100644
@@ -511,11 +511,17 @@ static void release_pte_pages(pte_t *pte, 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;

mm/khugepaged.c static void release_pte_pages(pte_t *pte, pte_t *_pte, · line 527

Quoted 10 lines
mm/khugepaged.c +7 -0
+		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) {

Best regards

Signature · 2 lines
Marek Szyprowski, PhD
Samsung R&D Institute Poland
Reviewed-by Tested-by
#2 lore raw
Quoted 8 lines · Marek Szyprowski
Quoted 7 lines · Vishal Moola (Oracle)

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.

Quoted 8 lines
Quoted 7 lines

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

Fixes 9bdfeea46f49 ("mm/khugepaged: convert release_pte_pages() to use folios")
Cc Matthew Wilcox <[email protected]>

Thanks!

Alex

Quoted 32 lines
Quoted 21 lines
---
   mm/khugepaged.c | 14 ++++++++++----
   1 file changed, 10 insertions(+), 4 deletions(-)
mm/khugepaged.c +3 -4
index b39ab219d5b7..bd54b957f69a 100644
@@ -511,11 +511,17 @@ static void release_pte_pages(pte_t *pte, 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;

mm/khugepaged.c static void release_pte_pages(pte_t *pte, pte_t *_pte, · line 527

Quoted 10 lines
mm/khugepaged.c +7 -0
+		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) {

Best regards

Reviewed-by on v1 1/1
#3 lore raw
In reply to Vishal Moola (Oracle)
Quoted 34 lines · Vishal Moola (Oracle)

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]/

Fixes 9bdfeea46f49 ("mm/khugepaged: convert release_pte_pages() to use folios")
Cc Matthew Wilcox <[email protected]>
---
  mm/khugepaged.c | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)
mm/khugepaged.c +3 -4
index b39ab219d5b7..bd54b957f69a 100644
@@ -511,11 +511,17 @@ static void release_pte_pages(pte_t *pte, 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;

mm/khugepaged.c static void release_pte_pages(pte_t *pte, pte_t *_pte, · line 527

Quoted 10 lines
mm/khugepaged.c +7 -0
+		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) {
Signature · 3 lines
Thanks,

David / dhildenb
Reviewed-by on v1 1/1
#4 lore raw
In reply to Vishal Moola (Oracle)
Quoted 8 lines · Vishal Moola (Oracle)

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.

Quoted 7 lines

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

Fixes 9bdfeea46f49 ("mm/khugepaged: convert release_pte_pages() to use folios")
Cc Matthew Wilcox <[email protected]>

Shall cc to stable?

Quoted 34 lines
---
 mm/khugepaged.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
mm/khugepaged.c +10 -5
index b39ab219d5b7..bd54b957f69a 100644
@@ -511,11 +511,17 @@ static void release_pte_pages(pte_t *pte, 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) {
--

2.39.1