Skip to content

Commit 64c37e1

Browse files
howlettakpm00
authored andcommitted
kernel: be more careful about dup_mmap() failures and uprobe registering
If a memory allocation fails during dup_mmap(), the maple tree can be left in an unsafe state for other iterators besides the exit path. All the locks are dropped before the exit_mmap() call (in mm/mmap.c), but the incomplete mm_struct can be reached through (at least) the rmap finding the vmas which have a pointer back to the mm_struct. Up to this point, there have been no issues with being able to find an mm_struct that was only partially initialised. Syzbot was able to make the incomplete mm_struct fail with recent forking changes, so it has been proven unsafe to use the mm_struct that hasn't been initialised, as referenced in the link below. Although 8ac662f ("fork: avoid inappropriate uprobe access to invalid mm") fixed the uprobe access, it does not completely remove the race. This patch sets the MMF_OOM_SKIP to avoid the iteration of the vmas on the oom side (even though this is extremely unlikely to be selected as an oom victim in the race window), and sets MMF_UNSTABLE to avoid other potential users from using a partially initialised mm_struct. When registering vmas for uprobe, skip the vmas in an mm that is marked unstable. Modifying a vma in an unstable mm may cause issues if the mm isn't fully initialised. Link: https://lore.kernel.org/all/6756d273.050a0220.2477f.003d.GAE@google.com/ Link: https://lkml.kernel.org/r/20250127170221.1761366-1-Liam.Howlett@oracle.com Fixes: d240629 ("fork: use __mt_dup() to duplicate maple tree in dup_mmap()") Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Jann Horn <jannh@google.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Michal Hocko <mhocko@suse.com> Cc: Peng Zhang <zhangpeng.00@bytedance.com> Cc: Matthew Wilcox <willy@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 4c80187 commit 64c37e1

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

kernel/events/uprobes.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <linux/rcupdate_trace.h>
2929
#include <linux/workqueue.h>
3030
#include <linux/srcu.h>
31+
#include <linux/oom.h> /* check_stable_address_space */
3132

3233
#include <linux/uprobes.h>
3334

@@ -1260,6 +1261,9 @@ register_for_each_vma(struct uprobe *uprobe, struct uprobe_consumer *new)
12601261
* returns NULL in find_active_uprobe_rcu().
12611262
*/
12621263
mmap_write_lock(mm);
1264+
if (check_stable_address_space(mm))
1265+
goto unlock;
1266+
12631267
vma = find_vma(mm, info->vaddr);
12641268
if (!vma || !valid_vma(vma, is_register) ||
12651269
file_inode(vma->vm_file) != uprobe->inode)

kernel/fork.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -760,16 +760,27 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
760760
mt_set_in_rcu(vmi.mas.tree);
761761
ksm_fork(mm, oldmm);
762762
khugepaged_fork(mm, oldmm);
763-
} else if (mpnt) {
763+
} else {
764+
764765
/*
765766
* The entire maple tree has already been duplicated. If the
766767
* mmap duplication fails, mark the failure point with
767768
* XA_ZERO_ENTRY. In exit_mmap(), if this marker is encountered,
768769
* stop releasing VMAs that have not been duplicated after this
769770
* point.
770771
*/
771-
mas_set_range(&vmi.mas, mpnt->vm_start, mpnt->vm_end - 1);
772-
mas_store(&vmi.mas, XA_ZERO_ENTRY);
772+
if (mpnt) {
773+
mas_set_range(&vmi.mas, mpnt->vm_start, mpnt->vm_end - 1);
774+
mas_store(&vmi.mas, XA_ZERO_ENTRY);
775+
/* Avoid OOM iterating a broken tree */
776+
set_bit(MMF_OOM_SKIP, &mm->flags);
777+
}
778+
/*
779+
* The mm_struct is going to exit, but the locks will be dropped
780+
* first. Set the mm_struct as unstable is advisable as it is
781+
* not fully initialised.
782+
*/
783+
set_bit(MMF_UNSTABLE, &mm->flags);
773784
}
774785
out:
775786
mmap_write_unlock(mm);

0 commit comments

Comments
 (0)