userfaultfd-verify-vma-state-across-uffdio_copy-retry.patch removed from -mm tree
The quilt patch titled
Subject: userfaultfd: verify VMA state across UFFDIO_COPY retry
has been removed from the -mm tree. Its filename was
userfaultfd-verify-vma-state-across-uffdio_copy-retry.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: "Mike Rapoport (Microsoft)" <[email protected]>
Subject: userfaultfd: verify VMA state across UFFDIO_COPY retry
Date: Wed, 27 May 2026 21:47:49 +0300
Patch series "userfaultfd: verify VMA state across UFFDIO_COPY retry", v2.
... and two more small fixes.
This patch (of 3):
mfill_copy_folio_retry() drops the VMA lock for copy_from_user() and reacquires it afterwards. The destination VMA can be replaced during that window.
The existing check compares vma_uffd_ops() before and after the retry, but if a shmem VMA with MAP_SHARED is replaced with a shmem VMA with MAP_PRIVATE (or vice versa) the replacement goes undetected.
The change from MAP_PRIVATE to MAP_SHARED will treat the folio allocated with shmem_alloc_folio() as anonymous and this will cause BUG() when mfill_atomic_install_pte() will try to folio_add_new_anon_rmap().
The change from MAP_SHARED to MAP_PRIVATE allows injection of folios into the page cache of the original VMA.
There is no need to change for hugetlb because it never uses mfill_copy_folio_retry().
Introduce helpers for more comprehensive comparison of VMA state:
- mfill_retry_state_save() to save the relevant VMA state into a struct mfill_retry_state (original uffd_ops, relevant VMA flags, vm_file and pgoff) before dropping the lock
- mfill_retry_state_changed() to compare the saved state with the state of the VMA acquired after retaking the locks
- mfill_retry_state_put() to release vm_file pinning.
Use DEFINE_FREE() cleanup to wrap mfill_retry_state_put() to avoid complicating error handling paths in mfill_copy_folio_retry().
---
mm/userfaultfd.c | 85 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 73 insertions(+), 12 deletions(-)
mm/userfaultfd.c renamed from mm/userfaultfd.c~userfaultfd-verify-vma-state-across-uffdio_copy-retry +73 -12
@@ -14,6 +14,8 @@#include <linux/userfaultfd_k.h> #include <linux/mmu_notifier.h> #include <linux/hugetlb.h> +#include <linux/file.h> +#include <linux/cleanup.h> #include <asm/tlbflush.h> #include <asm/tlb.h> #include "internal.h"
@@ -443,16 +445,80 @@ static int mfill_copy_folio_locked(strucreturn ret; } -static int mfill_copy_folio_retry (struct mfill_state *state, +#define MFILL_RETRY_STATE_VMA_FLAGS \ + append_vma_flags(__VMA_UFFD_FLAGS, VMA_SHARED_BIT) + +/* +* VMA state saved before dropping the locks in mfill_copy_folio_retry(). +* Used to detect VMA replacement or incompatible changes after reacquiring the +* locks. +*/ +struct mfill_retry_state { +const struct vm_uffd_ops *ops; +struct file *file; +vma_flags_t flags; +pgoff_t pgoff; +}; + +static void mfill_retry_state_save (struct mfill_retry_state *s, +struct vm_area_struct *vma) +{ + s->flags =vma_flags_and_mask (&vma->flags,MFILL_RETRY_STATE_VMA_FLAGS ); + s->ops =vma_uffd_ops (vma); + s->pgoff = vma->vm_pgoff; + +if (vma->vm_file) + s->file =get_file (vma->vm_file); +} + +static bool mfill_retry_state_changed (struct mfill_retry_state *state, +struct vm_area_struct *vma) +{ +vma_flags_t flags =vma_flags_and_mask (&vma->flags, +MFILL_RETRY_STATE_VMA_FLAGS ); + +/* Have any UFFD flags (missing, WP, minor) changed? */ +if (!vma_flags_same_pair (&state->flags, &flags)) +return true; + +/* VMA type or effective uffd_ops changed while the lock was dropped */ +if (state->ops !=vma_uffd_ops (vma)) +return true; + +/* VMA was anonymous before; changed only if it no longer is */ +if (!state->file) +return !vma_is_anonymous (vma); + +/* VMA was file backed, but file, inode or offset has changed */ +if (!vma->vm_file || vma->vm_file->f_inode != state->file->f_inode || + state->file != vma->vm_file || vma->vm_pgoff != state->pgoff) +return true; + +return false; +} + +static void mfill_retry_state_put (struct mfill_retry_state *s) +{ +if (s->file) +fput (s->file); +} + +DEFINE_FREE(retry_put, struct mfill_retry_state *, + if (_T) mfill_retry_state_put(_T)); + +static int mfill_copy_folio_retry (struct mfill_state *mfill_state,struct folio *folio) { -const struct vm_uffd_ops *orig_ops =vma_uffd_ops (state->vma); -unsigned long src_addr = state->src_addr; +struct mfill_retry_state retry_state = {0 }; + struct mfill_retry_state *for_free __free(retry_put) = &retry_state; +unsigned long src_addr = mfill_state->src_addr;void *kaddr;int err; +mfill_retry_state_save (&retry_state, mfill_state->vma); +/* retry copying with mm_lock dropped */ -mfill_put_vma (state); +mfill_put_vma (mfill_state); kaddr =kmap_local_folio (folio,0 ); err =copy_from_user (kaddr, (const void __user *) src_addr,PAGE_SIZE );
@@ -463,19 +529,14 @@ static int mfill_copy_folio_retry(structflush_dcache_folio (folio);/* reget VMA and PMD, they could change underneath us */ - err =mfill_get_vma (state); + err =mfill_get_vma (mfill_state);if (err)return err; -/* -* The VMA type may have changed while the lock was dropped -* (e.g. replaced with a hugetlb mapping), making the caller's -* ops pointer stale. -*/ -if (vma_uffd_ops (state->vma) != orig_ops) +if (mfill_retry_state_changed (&retry_state, mfill_state->vma))return -EAGAIN ; - err =mfill_establish_pmd (state); + err =mfill_establish_pmd (mfill_state);if (err)return err;
_
Patches currently in -mm which might be from [email protected] are
userfaultfd-ensure-mremap_userfaultfd_fail-releases-mmap_changing.patch userfaultfd-merge-fs-userfaultfdc-into-mm-userfaultfdc.patch userfaultfd-make-functions-that-are-not-used-outside-uffd-static.patch selftests-mm-hugetlb-read-hwpoison-add-sigbus-handler.patch selftests-mm-migration-dont-assume-huge-page-is-twomeg.patch selftests-mm-migration-make-nthreads-represent-number-of-working-threads.patch selftests-mm-migration-properly-cleanup-forked-processes.patch selftests-mm-run_vmtestssh-dont-gate-thp-and-ksm-tests-on-have_hugepages.patch selftests-mm-merge-map_hugetlb-into-hugepage-mmap.patch selftests-mm-rename-hugepage-tests-to-hugetlb.patch selftests-mm-hugetlb-shm-use-kselftest-framework.patch selftests-mm-hugetlb-vmemmap-use-kselftest-framework.patch selftests-mm-hugetlb-madvise-use-kselftest-framework.patch selftests-mm-hugetlb_madv_vs_map-use-kselftest-framework.patch selftests-mm-hugetlb-read-hwpoison-use-kselftest-framework.patch selftests-mm-khugepaged-group-tests-in-an-array.patch selftests-mm-khugepaged-use-ksefltest-framework.patch selftests-mm-khugepaged-use-ksefltest-framework-fix.patch selftests-mm-ksm_tests-use-kselftest-framework.patch selftests-mm-protection_keys-use-descriptive-test-names-in-the-output.patch selftests-mm-protection_keys-use-kselftest-framework.patch selftests-mm-uffd-common-use-kselftest-framework.patch selftests-mm-uffd-stress-use-kselftest-framework.patch selftests-mm-uffd-unit-tests-use-kselftest-framework.patch selftests-mm-va_high_addr_switch-use-kselftest-framework.patch selftests-mm-add-atexit-and-signal-handlers-to-thp_settings.patch selftests-mm-rename-thp_settings-to-hugepage_settings.patch selftests-mm-move-hugetlb-helpers-to-hugepage_settings.patch selftests-mm-hugepage_settings-use-unsigned-long-in-detect_hugetlb_page_size.patch selftests-mm-hugepage_settings-add-apis-to-get-and-set-nr_hugepages.patch selftests-mm-hugepage_settings-rename-and-rework-get_free_hugepages.patch selftests-mm-hugepage_settings-add-apis-for-hugetlb-setup-and-teardown.patch selftests-mm-move-read_file-read_num-and-write_num-to-vm_util.patch selftests-mm-vm_util-add-helpers-to-set-and-restore-shm-limits.patch selftests-mm-compaction_test-use-hugetlb-helpers.patch selftests-mm-cow-add-setup-of-hugetlb-pages.patch selftests-mm-gup_longterm-add-setup-of-hugetlb-pages.patch selftests-mm-gup_test-add-setup-of-hugetlb-pages.patch selftests-mm-hmm-tests-add-setup-of-hugetlb-pages.patch selftests-mm-hugepage_dio-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb_fault_after_madv-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-madvise-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb_madv_vs_map-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-mmap-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-mremap-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-shm-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-soft-offline-add-setup-of-hugetlb-pages.patch selftests-mm-hugetlb-vmemmap-add-setup-of-hugetlb-pages.patch selftests-mm-migration-add-setup-of-hugetlb-pages.patch selftests-mm-pagemap_ioctl-add-setup-of-hugetlb-pages.patch selftests-mm-protection_keys-use-library-code-for-hugetlb-setup.patch selftests-mm-thuge-gen-add-setup-of-hugetlb-pages.patch selftests-mm-uffd-stress-use-hugetlb_save-and-alloc-huge-pages.patch selftests-mm-uffd-unit-tests-add-setup-of-hugetlb-pages.patch selftests-mm-uffd-wp-mremap-add-setup-of-hugetlb-pages.patch selftests-mm-va_high_addr_switch-add-setup-of-hugetlb-pages.patch selftests-mm-va_high_addr_switchsh-drop-huge-pages-setup.patch selftests-mm-run_vmtestssh-free-memory-if-available-memory-is-low.patch selftests-mm-run_vmtestssh-drop-detection-and-setup-of-hugetlb.patch xor-use-kmalloc-in-calibrate_xor_blocks.patch raid6-use-kmalloc-in-raid6_select_algo.patch