summaryrefslogtreecommitdiff
path: root/fs/ramfs
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2009-03-13 13:51:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-03-14 11:57:22 -0700
commit15e7b8767605dc0cb9bd4594caabfec392385210 (patch)
tree3826c146f7ecce8188d76d83c5bf2875e5890909 /fs/ramfs
parent020fe22ff14320927f394de222cbb11708bcc7a8 (diff)
downloadlinux-3.10-15e7b8767605dc0cb9bd4594caabfec392385210.tar.gz
linux-3.10-15e7b8767605dc0cb9bd4594caabfec392385210.tar.bz2
linux-3.10-15e7b8767605dc0cb9bd4594caabfec392385210.zip
nommu: ramfs: don't leak pages when adding to page cache fails
When a ramfs nommu mapping is expanded, contiguous pages are allocated and added to the pagecache. The caller's reference is then passed on by moving whole pagevecs to the file lru list. If the page cache adding fails, make sure that the error path also moves the pagevec contents which might still contain up to PAGEVEC_SIZE successfully added pages, of which we would leak references otherwise. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Cc: David Howells <dhowells@redhat.com> Cc: Enrik Berkhan <Enrik.Berkhan@ge.com> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ramfs')
-rw-r--r--fs/ramfs/file-nommu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index 90d72bead55..5d7c7ececa6 100644
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -129,6 +129,7 @@ int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize)
return -EFBIG;
add_error:
+ pagevec_lru_add_file(&lru_pvec);
page_cache_release(pages + loop);
for (loop++; loop < npages; loop++)
__free_page(pages + loop);