Skip to content

Commit a919ddb

Browse files
Sasha Levinopsiff
authored andcommitted
mm/userfaultfd: fix kmap_local LIFO ordering for CONFIG_HIGHPTE
commit 9614d8b upstream. With CONFIG_HIGHPTE on 32-bit ARM, move_pages_pte() maps PTE pages using kmap_local_page(), which requires unmapping in Last-In-First-Out order. The current code maps dst_pte first, then src_pte, but unmaps them in the same order (dst_pte, src_pte), violating the LIFO requirement. This causes the warning in kunmap_local_indexed(): WARNING: CPU: 0 PID: 604 at mm/highmem.c:622 kunmap_local_indexed+0x178/0x17c addr \!= __fix_to_virt(FIX_KMAP_BEGIN + idx) Fix this by reversing the unmap order to respect LIFO ordering. This issue follows the same pattern as similar fixes: - commit eca6828 ("crypto: skcipher - fix mismatch between mapping and unmapping order") - commit 8cf57c6 ("nilfs2: eliminate staggered calls to kunmap in nilfs_rename") Both of which addressed the same fundamental requirement that kmap_local operations must follow LIFO ordering. Link: https://lkml.kernel.org/r/[email protected] Fixes: adef440 ("userfaultfd: UFFDIO_MOVE uABI") Signed-off-by: Sasha Levin <[email protected]> Acked-by: David Hildenbrand <[email protected]> Reviewed-by: Suren Baghdasaryan <[email protected]> Cc: Andrea Arcangeli <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit b051f707018967ea8f697d790a1ed8c443f63812)
1 parent 4cfebf3 commit a919ddb

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

mm/userfaultfd.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1432,10 +1432,15 @@ static int move_pages_pte(struct mm_struct *mm, pmd_t *dst_pmd, pmd_t *src_pmd,
14321432
folio_unlock(src_folio);
14331433
folio_put(src_folio);
14341434
}
1435-
if (dst_pte)
1436-
pte_unmap(dst_pte);
1435+
/*
1436+
* Unmap in reverse order (LIFO) to maintain proper kmap_local
1437+
* index ordering when CONFIG_HIGHPTE is enabled. We mapped dst_pte
1438+
* first, then src_pte, so we must unmap src_pte first, then dst_pte.
1439+
*/
14371440
if (src_pte)
14381441
pte_unmap(src_pte);
1442+
if (dst_pte)
1443+
pte_unmap(dst_pte);
14391444
mmu_notifier_invalidate_range_end(&range);
14401445
if (si)
14411446
put_swap_device(si);

0 commit comments

Comments
 (0)