diff options
author | Miklos Szeredi <mszeredi@redhat.com> | 2016-08-18 03:10:44 -0400 |
---|---|---|
committer | Miklos Szeredi <mszeredi@redhat.com> | 2016-11-15 06:34:21 -0500 |
commit | 59c3b76cc61d1d676f965c192cc7969aa5cb2744 (patch) | |
tree | 0958090c3fe9bd7d265cb46b02f04a9e4b2169bf /fs | |
parent | 0ce267ff95a0302cf6fb2a552833abbfb7861a43 (diff) |
fuse: fix fuse_write_end() if zero bytes were copied
If pos is at the beginning of a page and copied is zero then page is not
zeroed but is marked uptodate.
Fix by skipping everything except unlock/put of page if zero bytes were
copied.
Reported-by: Al Viro <viro@zeniv.linux.org.uk>
Fixes: 6b12c1b37e55 ("fuse: Implement write_begin/write_end callbacks")
Cc: <stable@vger.kernel.org> # v3.15+
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/fuse/file.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index abc66a6237fd..2401c5dabb2a 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c | |||
@@ -1985,6 +1985,10 @@ static int fuse_write_end(struct file *file, struct address_space *mapping, | |||
1985 | { | 1985 | { |
1986 | struct inode *inode = page->mapping->host; | 1986 | struct inode *inode = page->mapping->host; |
1987 | 1987 | ||
1988 | /* Haven't copied anything? Skip zeroing, size extending, dirtying. */ | ||
1989 | if (!copied) | ||
1990 | goto unlock; | ||
1991 | |||
1988 | if (!PageUptodate(page)) { | 1992 | if (!PageUptodate(page)) { |
1989 | /* Zero any unwritten bytes at the end of the page */ | 1993 | /* Zero any unwritten bytes at the end of the page */ |
1990 | size_t endoff = (pos + copied) & ~PAGE_MASK; | 1994 | size_t endoff = (pos + copied) & ~PAGE_MASK; |
@@ -1995,6 +1999,8 @@ static int fuse_write_end(struct file *file, struct address_space *mapping, | |||
1995 | 1999 | ||
1996 | fuse_write_update_size(inode, pos + copied); | 2000 | fuse_write_update_size(inode, pos + copied); |
1997 | set_page_dirty(page); | 2001 | set_page_dirty(page); |
2002 | |||
2003 | unlock: | ||
1998 | unlock_page(page); | 2004 | unlock_page(page); |
1999 | put_page(page); | 2005 | put_page(page); |
2000 | 2006 | ||