Skip to content

Commit bd1ee62

Browse files
Sasha Levingregkh
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/20250731144431.773923-1-sashal@kernel.org Fixes: adef440 ("userfaultfd: UFFDIO_MOVE uABI") Signed-off-by: Sasha Levin <sashal@kernel.org> Acked-by: David Hildenbrand <david@redhat.com> Reviewed-by: Suren Baghdasaryan <surenb@google.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 6bf9473 commit bd1ee62

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
@@ -1453,10 +1453,15 @@ static int move_pages_pte(struct mm_struct *mm, pmd_t *dst_pmd, pmd_t *src_pmd,
14531453
folio_unlock(src_folio);
14541454
folio_put(src_folio);
14551455
}
1456-
if (dst_pte)
1457-
pte_unmap(dst_pte);
1456+
/*
1457+
* Unmap in reverse order (LIFO) to maintain proper kmap_local
1458+
* index ordering when CONFIG_HIGHPTE is enabled. We mapped dst_pte
1459+
* first, then src_pte, so we must unmap src_pte first, then dst_pte.
1460+
*/
14581461
if (src_pte)
14591462
pte_unmap(src_pte);
1463+
if (dst_pte)
1464+
pte_unmap(dst_pte);
14601465
mmu_notifier_invalidate_range_end(&range);
14611466
if (si)
14621467
put_swap_device(si);

0 commit comments

Comments
 (0)