mm: don't skip arch_sync_kernel_mappings() in error paths
commit3685024eddupstream. Fix callers that previously skipped calling arch_sync_kernel_mappings() if an error occurred during a pgtable update. The call is still required to sync any pgtable updates that may have occurred prior to hitting the error condition. These are theoretical bugs discovered during code review. Link: https://lkml.kernel.org/r/20250226121610.2401743-1-ryan.roberts@arm.com Fixes:2ba3e6947a("mm/vmalloc: track which page-table levels were modified") Fixes:0c95cba492("mm: apply_to_pte_range warn and fail if a large pte is encountered") Signed-off-by: Ryan Roberts <ryan.roberts@arm.com> Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> Reviewed-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Christop Hellwig <hch@infradead.org> Cc: "Uladzislau Rezki (Sony)" <urezki@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
955c5a1ddd
commit
b4739de375
+4
-2
@@ -2713,8 +2713,10 @@ static int __apply_to_page_range(struct mm_struct *mm, unsigned long addr,
|
||||
next = pgd_addr_end(addr, end);
|
||||
if (pgd_none(*pgd) && !create)
|
||||
continue;
|
||||
if (WARN_ON_ONCE(pgd_leaf(*pgd)))
|
||||
return -EINVAL;
|
||||
if (WARN_ON_ONCE(pgd_leaf(*pgd))) {
|
||||
err = -EINVAL;
|
||||
break;
|
||||
}
|
||||
if (!pgd_none(*pgd) && WARN_ON_ONCE(pgd_bad(*pgd))) {
|
||||
if (!create)
|
||||
continue;
|
||||
|
||||
+2
-2
@@ -556,13 +556,13 @@ static int vmap_small_pages_range_noflush(unsigned long addr, unsigned long end,
|
||||
mask |= PGTBL_PGD_MODIFIED;
|
||||
err = vmap_pages_p4d_range(pgd, addr, next, prot, pages, &nr, &mask);
|
||||
if (err)
|
||||
return err;
|
||||
break;
|
||||
} while (pgd++, addr = next, addr != end);
|
||||
|
||||
if (mask & ARCH_PAGE_TABLE_SYNC_MASK)
|
||||
arch_sync_kernel_mappings(start, end);
|
||||
|
||||
return 0;
|
||||
return err;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user