Skip to content

Commit 33313a7

Browse files
surenbaghdasaryantorvalds
authored andcommitted
mm: lock newly mapped VMA which can be modified after it becomes visible
mmap_region adds a newly created VMA into VMA tree and might modify it afterwards before dropping the mmap_lock. This poses a problem for page faults handled under per-VMA locks because they don't take the mmap_lock and can stumble on this VMA while it's still being modified. Currently this does not pose a problem since post-addition modifications are done only for file-backed VMAs, which are not handled under per-VMA lock. However, once support for handling file-backed page faults with per-VMA locks is added, this will become a race. Fix this by write-locking the VMA before inserting it into the VMA tree. Other places where a new VMA is added into VMA tree do not modify it after the insertion, so do not need the same locking. Cc: [email protected] Signed-off-by: Suren Baghdasaryan <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent c137381 commit 33313a7

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

mm/mmap.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2812,6 +2812,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
28122812
if (vma->vm_file)
28132813
i_mmap_lock_write(vma->vm_file->f_mapping);
28142814

2815+
/* Lock the VMA since it is modified after insertion into VMA tree */
2816+
vma_start_write(vma);
28152817
vma_iter_store(&vmi, vma);
28162818
mm->map_count++;
28172819
if (vma->vm_file) {

0 commit comments

Comments
 (0)