Skip to content

Commit 8ac662f

Browse files
lorenzo-stoakesakpm00
authored andcommitted
fork: avoid inappropriate uprobe access to invalid mm
If dup_mmap() encounters an issue, currently uprobe is able to access the relevant mm via the reverse mapping (in build_map_info()), and if we are very unlucky with a race window, observe invalid XA_ZERO_ENTRY state which we establish as part of the fork error path. This occurs because uprobe_write_opcode() invokes anon_vma_prepare() which in turn invokes find_mergeable_anon_vma() that uses a VMA iterator, invoking vma_iter_load() which uses the advanced maple tree API and thus is able to observe XA_ZERO_ENTRY entries added to dup_mmap() in commit d240629 ("fork: use __mt_dup() to duplicate maple tree in dup_mmap()"). This change was made on the assumption that only process tear-down code would actually observe (and make use of) these values. However this very unlikely but still possible edge case with uprobes exists and unfortunately does make these observable. The uprobe operation prevents races against the dup_mmap() operation via the dup_mmap_sem semaphore, which is acquired via uprobe_start_dup_mmap() and dropped via uprobe_end_dup_mmap(), and held across register_for_each_vma() prior to invoking build_map_info() which does the reverse mapping lookup. Currently these are acquired and dropped within dup_mmap(), which exposes the race window prior to error handling in the invoking dup_mm() which tears down the mm. We can avoid all this by just moving the invocation of uprobe_start_dup_mmap() and uprobe_end_dup_mmap() up a level to dup_mm() and only release this lock once the dup_mmap() operation succeeds or clean up is done. This means that the uprobe code can never observe an incompletely constructed mm and resolves the issue in this case. Link: https://lkml.kernel.org/r/20241210172412.52995-1-lorenzo.stoakes@oracle.com Fixes: d240629 ("fork: use __mt_dup() to duplicate maple tree in dup_mmap()") Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Reported-by: syzbot+2d788f4f7cb660dac4b7@syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/6756d273.050a0220.2477f.003d.GAE@google.com/ Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jann Horn <jannh@google.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Liam R. Howlett <Liam.Howlett@Oracle.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Peng Zhang <zhangpeng.00@bytedance.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: David Hildenbrand <david@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 901ce97 commit 8ac662f

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

kernel/fork.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -639,11 +639,8 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
639639
LIST_HEAD(uf);
640640
VMA_ITERATOR(vmi, mm, 0);
641641

642-
uprobe_start_dup_mmap();
643-
if (mmap_write_lock_killable(oldmm)) {
644-
retval = -EINTR;
645-
goto fail_uprobe_end;
646-
}
642+
if (mmap_write_lock_killable(oldmm))
643+
return -EINTR;
647644
flush_cache_dup_mm(oldmm);
648645
uprobe_dup_mmap(oldmm, mm);
649646
/*
@@ -782,8 +779,6 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
782779
dup_userfaultfd_complete(&uf);
783780
else
784781
dup_userfaultfd_fail(&uf);
785-
fail_uprobe_end:
786-
uprobe_end_dup_mmap();
787782
return retval;
788783

789784
fail_nomem_anon_vma_fork:
@@ -1692,9 +1687,11 @@ static struct mm_struct *dup_mm(struct task_struct *tsk,
16921687
if (!mm_init(mm, tsk, mm->user_ns))
16931688
goto fail_nomem;
16941689

1690+
uprobe_start_dup_mmap();
16951691
err = dup_mmap(mm, oldmm);
16961692
if (err)
16971693
goto free_pt;
1694+
uprobe_end_dup_mmap();
16981695

16991696
mm->hiwater_rss = get_mm_rss(mm);
17001697
mm->hiwater_vm = mm->total_vm;
@@ -1709,6 +1706,8 @@ static struct mm_struct *dup_mm(struct task_struct *tsk,
17091706
mm->binfmt = NULL;
17101707
mm_init_owner(mm, NULL);
17111708
mmput(mm);
1709+
if (err)
1710+
uprobe_end_dup_mmap();
17121711

17131712
fail_nomem:
17141713
return NULL;

0 commit comments

Comments
 (0)