diff options
author | David Howells <dhowells@redhat.com> | 2010-01-15 20:01:36 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-16 15:15:40 -0500 |
commit | 81759b5b221107488bda99fe7beeb7b734f61133 (patch) | |
tree | 2ca1207d4ae5d6bbdc49db727a35b22a502fc76f | |
parent | efc1a3b16930c41d64ffefde16b87d82f603a8a0 (diff) |
nommu: fix race between ramfs truncation and shared mmap
Fix the race between the truncation of a ramfs file and an attempt to make
a shared mmap of region of that file.
The problem is that do_mmap_pgoff() calls f_op->get_unmapped_area() to
verify that the file region is made of contiguous pages and to find its
base address - but there isn't any locking to guarantee this region until
vma_prio_tree_insert() is called by add_vma_to_mm().
Note that moving the functionality into f_op->mmap() doesn't help as that
is also called before vma_prio_tree_insert().
Instead make ramfs_nommu_check_mappings() grab nommu_region_sem whilst it
does its checks. This means that this function will wait whilst mmaps
take place.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/ramfs/file-nommu.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c index 2efc57173fd7..266531343aae 100644 --- a/fs/ramfs/file-nommu.c +++ b/fs/ramfs/file-nommu.c | |||
@@ -131,6 +131,8 @@ static int ramfs_nommu_check_mappings(struct inode *inode, | |||
131 | struct vm_area_struct *vma; | 131 | struct vm_area_struct *vma; |
132 | struct prio_tree_iter iter; | 132 | struct prio_tree_iter iter; |
133 | 133 | ||
134 | down_write(&nommu_region_sem); | ||
135 | |||
134 | /* search for VMAs that fall within the dead zone */ | 136 | /* search for VMAs that fall within the dead zone */ |
135 | vma_prio_tree_foreach(vma, &iter, &inode->i_mapping->i_mmap, | 137 | vma_prio_tree_foreach(vma, &iter, &inode->i_mapping->i_mmap, |
136 | newsize >> PAGE_SHIFT, | 138 | newsize >> PAGE_SHIFT, |
@@ -138,10 +140,13 @@ static int ramfs_nommu_check_mappings(struct inode *inode, | |||
138 | ) { | 140 | ) { |
139 | /* found one - only interested if it's shared out of the page | 141 | /* found one - only interested if it's shared out of the page |
140 | * cache */ | 142 | * cache */ |
141 | if (vma->vm_flags & VM_SHARED) | 143 | if (vma->vm_flags & VM_SHARED) { |
144 | up_write(&nommu_region_sem); | ||
142 | return -ETXTBSY; /* not quite true, but near enough */ | 145 | return -ETXTBSY; /* not quite true, but near enough */ |
146 | } | ||
143 | } | 147 | } |
144 | 148 | ||
149 | up_write(&nommu_region_sem); | ||
145 | return 0; | 150 | return 0; |
146 | } | 151 | } |
147 | 152 | ||