Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / mm / filemap.c

diff --git a/mm/filemap.c b/mm/filemap.c
index 7a49bac..5c9d564 100644 (file)
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2453,6 +2453,9 @@ ssize_t generic_file_buffered_read(struct kiocb *iocb,
 
        if (unlikely(iocb->ki_pos >= inode->i_sb->s_maxbytes))
                return 0;
+       if (unlikely(!iov_iter_count(iter)))
+               return 0;
+
        iov_iter_truncate(iter, inode->i_sb->s_maxbytes);
 
        if (nr_pages > ARRAY_SIZE(pages_onstack))