Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fork: do not invoke uffd on fork if error occurs

Patch series "fork: do not expose incomplete mm on fork".

During fork we may place the virtual memory address space into an
inconsistent state before the fork operation is complete.

In addition, we may encounter an error during the fork operation that
indicates that the virtual memory address space is invalidated.

As a result, we should not be exposing it in any way to external machinery
that might interact with the mm or VMAs, machinery that is not designed to
deal with incomplete state.

We specifically update the fork logic to defer khugepaged and ksm to the
end of the operation and only to be invoked if no error arose, and
disallow uffd from observing fork events should an error have occurred.


This patch (of 2):

Currently on fork we expose the virtual address space of a process to
userland unconditionally if uffd is registered in VMAs, regardless of
whether an error arose in the fork.

This is performed in dup_userfaultfd_complete() which is invoked
unconditionally, and performs two duties - invoking registered handlers
for the UFFD_EVENT_FORK event via dup_fctx(), and clearing down
userfaultfd_fork_ctx objects established in dup_userfaultfd().

This is problematic, because the virtual address space may not yet be
correctly initialised if an error arose.

The change in commit d24062914837 ("fork: use __mt_dup() to duplicate
maple tree in dup_mmap()") makes this more pertinent as we may be in a
state where entries in the maple tree are not yet consistent.

We address this by, on fork error, ensuring that we roll back state that
we would otherwise expect to clean up through the event being handled by
userland and perform the memory freeing duty otherwise performed by
dup_userfaultfd_complete().

We do this by implementing a new function, dup_userfaultfd_fail(), which
performs the same loop, only decrementing reference counts.

Note that we perform mmgrab() on the parent and child mm's, however
userfaultfd_ctx_put() will mmdrop() this once the reference count drops to
zero, so we will avoid memory leaks correctly here.

Link: https://lkml.kernel.org/r/cover.1729014377.git.lorenzo.stoakes@oracle.com
Link: https://lkml.kernel.org/r/d3691d58bb58712b6fb3df2be441d175bd3cdf07.1729014377.git.lorenzo.stoakes@oracle.com
Fixes: d24062914837 ("fork: use __mt_dup() to duplicate maple tree in dup_mmap()")
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reported-by: Jann Horn <jannh@google.com>
Reviewed-by: Jann Horn <jannh@google.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Jan Kara <jack@suse.cz>
Cc: Linus Torvalds <torvalds@linuxfoundation.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Lorenzo Stoakes and committed by
Andrew Morton
f64e67e5 7c18d481

+37 -1
+28
fs/userfaultfd.c
··· 692 692 } 693 693 } 694 694 695 + void dup_userfaultfd_fail(struct list_head *fcs) 696 + { 697 + struct userfaultfd_fork_ctx *fctx, *n; 698 + 699 + /* 700 + * An error has occurred on fork, we will tear memory down, but have 701 + * allocated memory for fctx's and raised reference counts for both the 702 + * original and child contexts (and on the mm for each as a result). 703 + * 704 + * These would ordinarily be taken care of by a user handling the event, 705 + * but we are no longer doing so, so manually clean up here. 706 + * 707 + * mm tear down will take care of cleaning up VMA contexts. 708 + */ 709 + list_for_each_entry_safe(fctx, n, fcs, list) { 710 + struct userfaultfd_ctx *octx = fctx->orig; 711 + struct userfaultfd_ctx *ctx = fctx->new; 712 + 713 + atomic_dec(&octx->mmap_changing); 714 + VM_BUG_ON(atomic_read(&octx->mmap_changing) < 0); 715 + userfaultfd_ctx_put(octx); 716 + userfaultfd_ctx_put(ctx); 717 + 718 + list_del(&fctx->list); 719 + kfree(fctx); 720 + } 721 + } 722 + 695 723 void mremap_userfaultfd_prep(struct vm_area_struct *vma, 696 724 struct vm_userfaultfd_ctx *vm_ctx) 697 725 {
+5
include/linux/userfaultfd_k.h
··· 249 249 250 250 extern int dup_userfaultfd(struct vm_area_struct *, struct list_head *); 251 251 extern void dup_userfaultfd_complete(struct list_head *); 252 + void dup_userfaultfd_fail(struct list_head *); 252 253 253 254 extern void mremap_userfaultfd_prep(struct vm_area_struct *, 254 255 struct vm_userfaultfd_ctx *); ··· 349 348 } 350 349 351 350 static inline void dup_userfaultfd_complete(struct list_head *l) 351 + { 352 + } 353 + 354 + static inline void dup_userfaultfd_fail(struct list_head *l) 352 355 { 353 356 } 354 357
+4 -1
kernel/fork.c
··· 775 775 mmap_write_unlock(mm); 776 776 flush_tlb_mm(oldmm); 777 777 mmap_write_unlock(oldmm); 778 - dup_userfaultfd_complete(&uf); 778 + if (!retval) 779 + dup_userfaultfd_complete(&uf); 780 + else 781 + dup_userfaultfd_fail(&uf); 779 782 fail_uprobe_end: 780 783 uprobe_end_dup_mmap(); 781 784 return retval;