mm/khugepaged: Fix invalid page access in release_pte_pages()
Subsystems (2)
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]/
--- mm/khugepaged.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
mm/khugepaged.c +10 -4
@@ -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
Quoted 7 lines · Vishal Moola (Oracle)
release_pte_pages()converts from a pfn to a folio by usingpfn_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")Reported-by Marek Szyprowski <[email protected]>Debugged-by Alexandre Ghiti <[email protected]>Cc Matthew Wilcox <[email protected]>Signed-off-by Vishal Moola (Oracle) <[email protected]>
Quoted 20 lines
--- mm/khugepaged.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)mm/khugepaged.c +3
-4@@ -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
Quoted 8 lines · Marek Szyprowski
Quoted 7 lines · Vishal Moola (Oracle)
release_pte_pages()converts from a pfn to a folio by usingpfn_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")Reported-by Marek Szyprowski <[email protected]>Debugged-by Alexandre Ghiti <[email protected]>Cc Matthew Wilcox <[email protected]>Signed-off-by Vishal Moola (Oracle) <[email protected]>Tested-by Marek Szyprowski <[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@@ -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
Quoted 34 lines · Vishal Moola (Oracle)
release_pte_pages()converts from a pfn to a folio by usingpfn_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")Reported-by Marek Szyprowski <[email protected]>Debugged-by Alexandre Ghiti <[email protected]>Cc Matthew Wilcox <[email protected]>Signed-off-by Vishal Moola (Oracle) <[email protected]>--- mm/khugepaged.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)mm/khugepaged.c +3
-4@@ -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
Quoted 8 lines · Vishal Moola (Oracle)
release_pte_pages()converts from a pfn to a folio by usingpfn_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")Reported-by Marek Szyprowski <[email protected]>Debugged-by Alexandre Ghiti <[email protected]>Cc Matthew Wilcox <[email protected]>Signed-off-by Vishal Moola (Oracle) <[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@@ -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