]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mm/userfaultfd: fix kmap_local LIFO ordering for CONFIG_HIGHPTE
authorSasha Levin <sashal@kernel.org>
Thu, 31 Jul 2025 14:44:31 +0000 (10:44 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Sep 2025 16:58:15 +0000 (18:58 +0200)
commit 9614d8bee66387501f48718fa306e17f2aa3f2f3 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 eca6828403b8 ("crypto: skcipher - fix mismatch between mapping and unmapping order")
- commit 8cf57c6df818 ("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: adef440691ba ("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>
mm/userfaultfd.c

index 8b0f2fbd6a759d3df47b8526381b23cbaf8db40d..904095f69a6e31dbea339b8b7a27256385e03b9d 100644 (file)
@@ -1432,10 +1432,15 @@ out:
                folio_unlock(src_folio);
                folio_put(src_folio);
        }
-       if (dst_pte)
-               pte_unmap(dst_pte);
+       /*
+        * Unmap in reverse order (LIFO) to maintain proper kmap_local
+        * index ordering when CONFIG_HIGHPTE is enabled. We mapped dst_pte
+        * first, then src_pte, so we must unmap src_pte first, then dst_pte.
+        */
        if (src_pte)
                pte_unmap(src_pte);
+       if (dst_pte)
+               pte_unmap(dst_pte);
        mmu_notifier_invalidate_range_end(&range);
        if (si)
                put_swap_device(si);