From: Al Viro Date: Tue, 6 Sep 2016 01:42:32 +0000 (-0400) Subject: nfs_write_end(): fix handling of short copies X-Git-Tag: v3.18.47~22 X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79762247b6a0ec1b6f45e3ae7213e7e9b400e05c;p=linux nfs_write_end(): fix handling of short copies [ Upstream commit c0cf3ef5e0f47e385920450b245d22bead93e7ad ] 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 Signed-off-by: Sasha Levin --- diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 2ab6f00dba5b..c85da0fc4593 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -410,7 +410,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,