linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm, fs: avoid page allocation beyond i_size on read
@ 2013-08-21 15:37 Kirill A. Shutemov
  2013-08-21 15:46 ` Steven Whitehouse
  0 siblings, 1 reply; 12+ messages in thread
From: Kirill A. Shutemov @ 2013-08-21 15:37 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Dave Hansen, Jan Kara, Al Viro, NeilBrown, linux-mm, linux-kernel,
	Kirill A. Shutemov

I've noticed that we allocated unneeded page for cache on read beyond
i_size. Simple test case (I checked it on ramfs):

$ touch testfile
$ cat testfile

It triggers 'no_cached_page' code path in do_generic_file_read().

Looks like it's regression since commit a32ea1e. Let's fix it.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: NeilBrown <neilb@suse.de>
---
 mm/filemap.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/mm/filemap.c b/mm/filemap.c
index 1905f0e..b1a4d35 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1163,6 +1163,10 @@ static void do_generic_file_read(struct file *filp, loff_t *ppos,
 		loff_t isize;
 		unsigned long nr, ret;
 
+		isize = i_size_read(inode);
+		if (!isize || index > (isize - 1) >> PAGE_CACHE_SHIFT)
+			goto out;
+
 		cond_resched();
 find_page:
 		page = find_get_page(mapping, index);
-- 
1.8.4.rc2

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2013-08-22 15:34 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-21 15:37 [PATCH] mm, fs: avoid page allocation beyond i_size on read Kirill A. Shutemov
2013-08-21 15:46 ` Steven Whitehouse
2013-08-21 16:08   ` Kirill A. Shutemov
2013-08-21 16:42     ` Steven Whitehouse
2013-08-21 20:58       ` Andrew Morton
2013-08-22  9:28         ` Steven Whitehouse
2013-08-22 13:05           ` Kirill A. Shutemov
2013-08-22 13:33             ` Steven Whitehouse
2013-08-22 14:30               ` Kirill A. Shutemov
2013-08-22 14:59                 ` Steven Whitehouse
2013-08-22 15:16                   ` Kirill A. Shutemov
2013-08-22 15:34                     ` Steven Whitehouse

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).