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.2.87~164 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=bdfb0cb3f4f17c80ce2179448f5868609ea5b34e;ds=inline nfs_write_end(): fix handling of short copies commit c0cf3ef5e0f47e385920450b245d22bead93e7ad upstream. 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. Signed-off-by: Al Viro Signed-off-by: Ben Hutchings --- diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 961e562c8a7a..8b8d6a54140c 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -397,7 +397,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,