summaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-09-05 21:42:32 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2016-12-09 22:41:47 -0500
commitc0cf3ef5e0f47e385920450b245d22bead93e7ad (patch)
tree81db472b3d4c969ba0e3c9423ddad79ff793cc69 /fs/nfs
parente5517c2a5a49ed5e99047008629f1cd60246ea0e (diff)
downloadlinux-c0cf3ef5e0f47e385920450b245d22bead93e7ad.tar.gz
linux-c0cf3ef5e0f47e385920450b245d22bead93e7ad.tar.bz2
linux-c0cf3ef5e0f47e385920450b245d22bead93e7ad.zip
nfs_write_end(): fix handling of short copies
What matters when deciding if we should make a page uptodate is not how much we _wanted_ to copy, but how much we actually have copied. As it is, on architectures that do not zero tail on short copy we can leave uninitialized data in page marked uptodate. Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 9ea85ae23c32..a1de8ef63e56 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -374,7 +374,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
*/
if (!PageUptodate(page)) {
unsigned pglen = nfs_page_length(page);
- unsigned end = offset + len;
+ unsigned end = offset + copied;
if (pglen == 0) {
zero_user_segments(page, 0, offset,