]> git.baikalelectronics.ru Git - kernel.git/commitdiff
mm/page_table_check: fix accessing unmapped ptep
authorMiaohe Lin <linmiaohe@huawei.com>
Thu, 26 May 2022 11:33:50 +0000 (19:33 +0800)
committerakpm <akpm@linux-foundation.org>
Fri, 27 May 2022 15:55:18 +0000 (08:55 -0700)
ptep is unmapped too early, so ptep could theoretically be accessed while
it's unmapped.  This might become a problem if/when CONFIG_HIGHPTE becomes
available on riscv.

Fix it by deferring pte_unmap() until page table checking is done.

[akpm@linux-foundation.org: account for ptep alteration, per Matthew]
Link: https://lkml.kernel.org/r/20220526113350.30806-1-linmiaohe@huawei.com
Fixes: 80110bbfbba6 ("mm/page_table_check: check entries at pmd levels")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Acked-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Cc: Qi Zheng <zhengqi.arch@bytedance.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
mm/page_table_check.c

index 2458281bff893bc68576bcf269c039c8fc6c26c7..bc55be28807f80240e294d39ae7e99d6bba85aea 100644 (file)
@@ -251,11 +251,11 @@ void __page_table_check_pte_clear_range(struct mm_struct *mm,
                pte_t *ptep = pte_offset_map(&pmd, addr);
                unsigned long i;
 
-               pte_unmap(ptep);
                for (i = 0; i < PTRS_PER_PTE; i++) {
                        __page_table_check_pte_clear(mm, addr, *ptep);
                        addr += PAGE_SIZE;
                        ptep++;
                }
+               pte_unmap(ptep - PTRS_PER_PTE);
        }
 }