diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-09-05 21:42:32 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-09 08:32:24 +0100 |
| commit | b775b86a5fe8f45500ce027a60ca0f1e1f49a13e (patch) | |
| tree | e46af49fff2b5afdf97f852a1488851182ec8622 /fs/nfs | |
| parent | fc6cb9c303e289e0772cd9db593db9acd15cd678 (diff) | |
| download | linux-stable-b775b86a5fe8f45500ce027a60ca0f1e1f49a13e.tar.gz linux-stable-b775b86a5fe8f45500ce027a60ca0f1e1f49a13e.tar.bz2 linux-stable-b775b86a5fe8f45500ce027a60ca0f1e1f49a13e.zip | |
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 <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/file.c | 2 |
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, |