Skip to content

Commit 04f5866

Browse files
aagittorvalds
authored andcommitted
coredump: fix race condition between mmget_not_zero()/get_task_mm() and core dumping
The core dumping code has always run without holding the mmap_sem for writing, despite that is the only way to ensure that the entire vma layout will not change from under it. Only using some signal serialization on the processes belonging to the mm is not nearly enough. This was pointed out earlier. For example in Hugh's post from Jul 2017: https://lkml.kernel.org/r/alpine.LSU.2.11.1707191716030.2055@eggly.anvils "Not strictly relevant here, but a related note: I was very surprised to discover, only quite recently, how handle_mm_fault() may be called without down_read(mmap_sem) - when core dumping. That seems a misguided optimization to me, which would also be nice to correct" In particular because the growsdown and growsup can move the vm_start/vm_end the various loops the core dump does around the vma will not be consistent if page faults can happen concurrently. Pretty much all users calling mmget_not_zero()/get_task_mm() and then taking the mmap_sem had the potential to introduce unexpected side effects in the core dumping code. Adding mmap_sem for writing around the ->core_dump invocation is a viable long term fix, but it requires removing all copy user and page faults and to replace them with get_dump_page() for all binary formats which is not suitable as a short term fix. For the time being this solution manually covers the places that can confuse the core dump either by altering the vma layout or the vma flags while it runs. Once ->core_dump runs under mmap_sem for writing the function mmget_still_valid() can be dropped. Allowing mmap_sem protected sections to run in parallel with the coredump provides some minor parallelism advantage to the swapoff code (which seems to be safe enough by never mangling any vma field and can keep doing swapins in parallel to the core dumping) and to some other corner case. In order to facilitate the backporting I added "Fixes: 86039bd" however the side effect of this same race condition in /proc/pid/mem should be reproducible since before 2.6.12-rc2 so I couldn't add any other "Fixes:" because there's no hash beyond the git genesis commit. Because find_extend_vma() is the only location outside of the process context that could modify the "mm" structures under mmap_sem for reading, by adding the mmget_still_valid() check to it, all other cases that take the mmap_sem for reading don't need the new check after mmget_not_zero()/get_task_mm(). The expand_stack() in page fault context also doesn't need the new check, because all tasks under core dumping are frozen. Link: http://lkml.kernel.org/r/20190325224949.11068-1-aarcange@redhat.com Fixes: 86039bd ("userfaultfd: add new syscall to provide memory externalization") Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Reported-by: Jann Horn <jannh@google.com> Suggested-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Peter Xu <peterx@redhat.com> Reviewed-by: Mike Rapoport <rppt@linux.ibm.com> Reviewed-by: Oleg Nesterov <oleg@redhat.com> Reviewed-by: Jann Horn <jannh@google.com> Acked-by: Jason Gunthorpe <jgg@mellanox.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent dce5b0b commit 04f5866

File tree

5 files changed

+57
-1
lines changed

5 files changed

+57
-1
lines changed

drivers/infiniband/core/uverbs_main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -993,6 +993,8 @@ void uverbs_user_mmap_disassociate(struct ib_uverbs_file *ufile)
993993
* will only be one mm, so no big deal.
994994
*/
995995
down_write(&mm->mmap_sem);
996+
if (!mmget_still_valid(mm))
997+
goto skip_mm;
996998
mutex_lock(&ufile->umap_lock);
997999
list_for_each_entry_safe (priv, next_priv, &ufile->umaps,
9981000
list) {
@@ -1007,6 +1009,7 @@ void uverbs_user_mmap_disassociate(struct ib_uverbs_file *ufile)
10071009
vma->vm_flags &= ~(VM_SHARED | VM_MAYSHARE);
10081010
}
10091011
mutex_unlock(&ufile->umap_lock);
1012+
skip_mm:
10101013
up_write(&mm->mmap_sem);
10111014
mmput(mm);
10121015
}

fs/proc/task_mmu.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,6 +1143,24 @@ static ssize_t clear_refs_write(struct file *file, const char __user *buf,
11431143
count = -EINTR;
11441144
goto out_mm;
11451145
}
1146+
/*
1147+
* Avoid to modify vma->vm_flags
1148+
* without locked ops while the
1149+
* coredump reads the vm_flags.
1150+
*/
1151+
if (!mmget_still_valid(mm)) {
1152+
/*
1153+
* Silently return "count"
1154+
* like if get_task_mm()
1155+
* failed. FIXME: should this
1156+
* function have returned
1157+
* -ESRCH if get_task_mm()
1158+
* failed like if
1159+
* get_proc_task() fails?
1160+
*/
1161+
up_write(&mm->mmap_sem);
1162+
goto out_mm;
1163+
}
11461164
for (vma = mm->mmap; vma; vma = vma->vm_next) {
11471165
vma->vm_flags &= ~VM_SOFTDIRTY;
11481166
vma_set_page_prot(vma);

fs/userfaultfd.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,8 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
629629

630630
/* the various vma->vm_userfaultfd_ctx still points to it */
631631
down_write(&mm->mmap_sem);
632+
/* no task can run (and in turn coredump) yet */
633+
VM_WARN_ON(!mmget_still_valid(mm));
632634
for (vma = mm->mmap; vma; vma = vma->vm_next)
633635
if (vma->vm_userfaultfd_ctx.ctx == release_new_ctx) {
634636
vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
@@ -883,6 +885,8 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
883885
* taking the mmap_sem for writing.
884886
*/
885887
down_write(&mm->mmap_sem);
888+
if (!mmget_still_valid(mm))
889+
goto skip_mm;
886890
prev = NULL;
887891
for (vma = mm->mmap; vma; vma = vma->vm_next) {
888892
cond_resched();
@@ -905,6 +909,7 @@ static int userfaultfd_release(struct inode *inode, struct file *file)
905909
vma->vm_flags = new_flags;
906910
vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
907911
}
912+
skip_mm:
908913
up_write(&mm->mmap_sem);
909914
mmput(mm);
910915
wakeup:
@@ -1333,6 +1338,8 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx,
13331338
goto out;
13341339

13351340
down_write(&mm->mmap_sem);
1341+
if (!mmget_still_valid(mm))
1342+
goto out_unlock;
13361343
vma = find_vma_prev(mm, start, &prev);
13371344
if (!vma)
13381345
goto out_unlock;
@@ -1520,6 +1527,8 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx,
15201527
goto out;
15211528

15221529
down_write(&mm->mmap_sem);
1530+
if (!mmget_still_valid(mm))
1531+
goto out_unlock;
15231532
vma = find_vma_prev(mm, start, &prev);
15241533
if (!vma)
15251534
goto out_unlock;

include/linux/sched/mm.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,27 @@ static inline void mmdrop(struct mm_struct *mm)
4949
__mmdrop(mm);
5050
}
5151

52+
/*
53+
* This has to be called after a get_task_mm()/mmget_not_zero()
54+
* followed by taking the mmap_sem for writing before modifying the
55+
* vmas or anything the coredump pretends not to change from under it.
56+
*
57+
* NOTE: find_extend_vma() called from GUP context is the only place
58+
* that can modify the "mm" (notably the vm_start/end) under mmap_sem
59+
* for reading and outside the context of the process, so it is also
60+
* the only case that holds the mmap_sem for reading that must call
61+
* this function. Generally if the mmap_sem is hold for reading
62+
* there's no need of this check after get_task_mm()/mmget_not_zero().
63+
*
64+
* This function can be obsoleted and the check can be removed, after
65+
* the coredump code will hold the mmap_sem for writing before
66+
* invoking the ->core_dump methods.
67+
*/
68+
static inline bool mmget_still_valid(struct mm_struct *mm)
69+
{
70+
return likely(!mm->core_state);
71+
}
72+
5273
/**
5374
* mmget() - Pin the address space associated with a &struct mm_struct.
5475
* @mm: The address space to pin.

mm/mmap.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include <linux/moduleparam.h>
4646
#include <linux/pkeys.h>
4747
#include <linux/oom.h>
48+
#include <linux/sched/mm.h>
4849

4950
#include <linux/uaccess.h>
5051
#include <asm/cacheflush.h>
@@ -2525,7 +2526,8 @@ find_extend_vma(struct mm_struct *mm, unsigned long addr)
25252526
vma = find_vma_prev(mm, addr, &prev);
25262527
if (vma && (vma->vm_start <= addr))
25272528
return vma;
2528-
if (!prev || expand_stack(prev, addr))
2529+
/* don't alter vm_end if the coredump is running */
2530+
if (!prev || !mmget_still_valid(mm) || expand_stack(prev, addr))
25292531
return NULL;
25302532
if (prev->vm_flags & VM_LOCKED)
25312533
populate_vma_page_range(prev, addr, prev->vm_end, NULL);
@@ -2551,6 +2553,9 @@ find_extend_vma(struct mm_struct *mm, unsigned long addr)
25512553
return vma;
25522554
if (!(vma->vm_flags & VM_GROWSDOWN))
25532555
return NULL;
2556+
/* don't alter vm_start if the coredump is running */
2557+
if (!mmget_still_valid(mm))
2558+
return NULL;
25542559
start = vma->vm_start;
25552560
if (expand_stack(vma, addr))
25562561
return NULL;

0 commit comments

Comments
 (0)