mirror of
https://github.com/torvalds/linux.git
synced 2024-11-29 07:31:29 +00:00
mm/vma: extract validate_mm() from vma_complete()
vma_complete() will need to be called during an unsafe time to call validate_mm(). Extract the call in all places now so that only one location can be modified in the next change. Link: https://lkml.kernel.org/r/20240830040101.822209-8-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com> Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Bert Karwatzki <spasswolf@web.de> Cc: Jeff Xu <jeffxu@chromium.org> Cc: Jiri Olsa <olsajiri@gmail.com> Cc: Kees Cook <kees@kernel.org> Cc: Lorenzo Stoakes <lstoakes@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: Matthew Wilcox <willy@infradead.org> Cc: "Paul E. McKenney" <paulmck@kernel.org> Cc: Paul Moore <paul@paul-moore.com> Cc: Sidhartha Kumar <sidhartha.kumar@oracle.com> Cc: Suren Baghdasaryan <surenb@google.com> Cc: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
parent
17f1ae9b40
commit
89b2d2a57e
@ -1796,6 +1796,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
|
||||
vma_iter_store(vmi, vma);
|
||||
|
||||
vma_complete(&vp, vmi, mm);
|
||||
validate_mm(mm);
|
||||
khugepaged_enter_vma(vma, flags);
|
||||
goto out;
|
||||
}
|
||||
|
5
mm/vma.c
5
mm/vma.c
@ -269,6 +269,7 @@ static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
|
||||
|
||||
/* vma_complete stores the new vma */
|
||||
vma_complete(&vp, vmi, vma->vm_mm);
|
||||
validate_mm(vma->vm_mm);
|
||||
|
||||
/* Success. */
|
||||
if (new_below)
|
||||
@ -548,6 +549,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
|
||||
vma_iter_store(vmi, vma);
|
||||
|
||||
vma_complete(&vp, vmi, vma->vm_mm);
|
||||
validate_mm(vma->vm_mm);
|
||||
return 0;
|
||||
|
||||
nomem:
|
||||
@ -589,6 +591,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma,
|
||||
vma_iter_clear(vmi);
|
||||
vma_set_range(vma, start, end, pgoff);
|
||||
vma_complete(&vp, vmi, vma->vm_mm);
|
||||
validate_mm(vma->vm_mm);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -668,7 +671,6 @@ again:
|
||||
}
|
||||
if (vp->insert && vp->file)
|
||||
uprobe_mmap(vp->insert);
|
||||
validate_mm(mm);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1197,6 +1199,7 @@ static struct vm_area_struct
|
||||
}
|
||||
|
||||
vma_complete(&vp, vmi, mm);
|
||||
validate_mm(mm);
|
||||
khugepaged_enter_vma(res, vm_flags);
|
||||
return res;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user