mm/vma: write lock source VMA before duplicating it in __split_vma()

__split_vma() duplicates the source VMA before taking its VMA write lock,
and until the VMA is write-locked, a concurrent thread might set
VMA_MAYBE_GUARD_BIT, resulting in the duplication missing the flag.

If this happens, then fork may fail to duplicate guard markers and, if a
file-backed mapping, THP collapse may also discard the markers.

Resolve this by taking the VMA write lock before vm_area_dup() and, since
all callers of vm_area_dup() now hold the VMA write lock, assert that this
is the case there, and add a comment to explain why it's needed.

[[email protected]: add VMA write assert in vm_area_dup(), commit message touchup]
Link: https://lore.kernel.org/[email protected]
Fixes: 2ab7f1bbaf ("mm/madvise: allow guard page install/remove under VMA lock")
Signed-off-by: David Hildenbrand (Arm) <[email protected]>
Signed-off-by: Lorenzo Stoakes (ARM) <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Reviewed-by: Lorenzo Stoakes (ARM) <[email protected]>
Reviewed-by: Davidlohr Bueso <[email protected]>
Reviewed-by: Pedro Falcato <[email protected]> 
Tested-by: Gregory Price (Meta) <[email protected]>
Cc: Liam R. Howlett <[email protected]>
Cc: Vlastimil Babka <[email protected]>
Cc: Mike Rapoport <[email protected]>
Cc: Suren Baghdasaryan <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Jann Horn <[email protected]>
Cc: SJ Park <[email protected]>
Cc: Kees Cook <[email protected]>
Cc: Colin Cross <[email protected]>
Cc: <[email protected]>
This commit is contained in:
David Hildenbrand (Arm)
2026-11-02 18:14:42 -08:00
committed by Andrew Morton
parent 13fc99f463
commit 769417e410
2 changed files with 4 additions and 1 deletions
+1 -1
View File
@@ -538,6 +538,7 @@ __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
return err;
}
vma_start_write(vma);
new = vm_area_dup(vma);
if (!new)
return -ENOMEM;
@@ -568,7 +569,6 @@ __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new);
vma_start_write(vma);
vma_start_write(new);
init_vma_prep(&vp, vma);
+3
View File
@@ -127,6 +127,9 @@ struct vm_area_struct *vm_area_dup(struct vm_area_struct *orig)
{
struct vm_area_struct *new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
/* Must hold a write lock to stabilise atomic VMA flags. */
vma_assert_write_locked(orig);
if (!new)
return NULL;