The patch titled Subject: mm-userfaultfd-fix-uffd-wp-special-cases-for-fork-fix has been added to the -mm tree. Its filename is mm-userfaultfd-fix-uffd-wp-special-cases-for-fork-fix.patch This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-userfaultfd-fix-uffd-wp-special-cases-for-fork-fix.patch and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-userfaultfd-fix-uffd-wp-special-cases-for-fork-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: mm-userfaultfd-fix-uffd-wp-special-cases-for-fork-fix fix it for "mm: Device exclusive memory access". Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Cc: Axel Rasmussen <axelrasmussen@xxxxxxxxxx> Cc: Brian Geffon <bgeffon@xxxxxxxxxx> Cc: "Dr . David Alan Gilbert" <dgilbert@xxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Jerome Glisse <jglisse@xxxxxxxxxx> Cc: Joe Perches <joe@xxxxxxxxxxx> Cc: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx> Cc: Lokesh Gidra <lokeshgidra@xxxxxxxxxx> Cc: Mike Kravetz <mike.kravetz@xxxxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx> Cc: Mina Almasry <almasrymina@xxxxxxxxxx> Cc: Oliver Upton <oupton@xxxxxxxxxx> Cc: Peter Xu <peterx@xxxxxxxxxx> Cc: Shaohua Li <shli@xxxxxx> Cc: Shuah Khan <shuah@xxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Wang Qing <wangqing@xxxxxxxx> Cc: Alistair Popple <apopple@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/memory.c~mm-userfaultfd-fix-uffd-wp-special-cases-for-fork-fix +++ a/mm/memory.c @@ -850,8 +850,8 @@ copy_nonpresent_pte(struct mm_struct *ds * exclusive entries currently only support private writable * (ie. COW) mappings. */ - VM_BUG_ON(!is_cow_mapping(vma->vm_flags)); - if (try_restore_exclusive_pte(src_mm, src_pte, vma, addr)) + VM_BUG_ON(!is_cow_mapping(dst_vma->vm_flags)); + if (try_restore_exclusive_pte(src_mm, src_pte, dst_vma, addr)) return -EBUSY; return -ENOENT; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are mm-hugetlb-fix-resv_huge_pages-underflow-on-uffdio_copy-fix.patch mm.patch mm-slub-kunit-add-a-kunit-test-for-slub-debugging-functionality-fix-2.patch mm-gup-pack-has_pinned-in-mmf_has_pinned-checkpatch-fixes.patch mm-memcg-optimize-user-context-object-stock-access-checkpatch-fixes.patch mm-memcg-slab-create-a-new-set-of-kmalloc-cg-n-caches-v5-fix.patch binfmt-remove-in-tree-usage-of-map_executable-fix.patch mm-mmap-introduce-unlock_range-for-code-cleanup-fix.patch powerpc-mm-book3s64-update-tlb-flush-routines-to-take-a-page-walk-cache-flush-argument-fix.patch mm-mremap-use-range-flush-that-does-tlb-and-page-walk-cache-flush-fix.patch mm-memory-failure-use-a-mutex-to-avoid-memory_failure-races-fix.patch mm-memory_hotplug-disable-memmap_on_memory-when-hugetlb_free_vmemmap-enabled-fix.patch mm-userfaultfd-fix-uffd-wp-special-cases-for-fork-fix.patch mm-thp-check-total_mapcount-instead-of-page_mapcount-fix-fix.patch nommu-remove-__gfp_highmem-in-vmalloc-vzalloc-checkpatch-fixes.patch mm-madvise-introduce-madv_populate_readwrite-to-prefault-page-tables-checkpatch-fixes.patch kernelh-split-out-panic-and-oops-helpers-fix.patch lib-math-rational-add-kunit-test-cases-fix.patch lib-decompressors-remove-set-but-not-used-variabled-level-fix.patch linux-next-pre.patch linux-next-post.patch mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas-fix.patch module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix.patch module-add-printk-formats-to-add-module-build-id-to-stacktraces-fix-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch