]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
nfs_write_end(): fix handling of short copies
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 6 Sep 2016 01:42:32 +0000 (21:42 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 10 Dec 2016 03:41:47 +0000 (22:41 -0500)
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>
fs/nfs/file.c

index 9ea85ae23c320b2dcb7409c97c3da3fa93a4fc12..a1de8ef63e56992c6e7eeb554c00dfc024111f94 100644 (file)
@@ -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,