Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/linville...

[~andy/linux] / fs / ecryptfs / mmap.c

diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 6df410c7726471c28b493c9d2b91f61ca6072696..7d5a43cb0d5c81ee470ee8ec9f7a7cabc329b7e7 100644 (file)
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -422,6 +422,8 @@ static int ecryptfs_prepare_write(struct file *file, struct page *page,
                                goto out;
                        }
                }
+               if (end_of_prev_pg_pos + 1 > i_size_read(page->mapping->host))
+                       zero_user_page(page, 0, PAGE_CACHE_SIZE, KM_USER0);
        }
 out:
        return rc;