Commit 576cfe61 authored by Al Viro's avatar Al Viro Committed by Sasha Levin

nfs_write_end(): fix handling of short copies

[ Upstream commit c0cf3ef5 ]

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
parent 77f3c11c
...@@ -414,7 +414,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping, ...@@ -414,7 +414,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
*/ */
if (!PageUptodate(page)) { if (!PageUptodate(page)) {
unsigned pglen = nfs_page_length(page); unsigned pglen = nfs_page_length(page);
unsigned end = offset + len; unsigned end = offset + copied;
if (pglen == 0) { if (pglen == 0) {
zero_user_segments(page, 0, offset, zero_user_segments(page, 0, offset,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment