projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
[powerpc.git]
/
fs
/
ecryptfs
/
mmap.c
diff --git
a/fs/ecryptfs/mmap.c
b/fs/ecryptfs/mmap.c
index
6df410c
..
7d5a43c
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;