diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2016-08-18 09:10:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-11-26 09:54:52 +0100 |
| commit | b7321bcc8b1c153cb50eddbe4d90fdbc89c9d0b9 (patch) | |
| tree | cf55d07e0c0aa962677a9657d800f9e44729d5c5 /fs | |
| parent | d4a774fdb92f37da91ebd827c3e507b542ab29b1 (diff) | |
fuse: fix fuse_write_end() if zero bytes were copied
commit 59c3b76cc61d1d676f965c192cc7969aa5cb2744 upstream.
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")
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 682e79965c16..8821c380a71a 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -1997,6 +1997,10 @@ static int fuse_write_end(struct file *file, struct address_space *mapping, { struct inode *inode = page->mapping->host; + /* Haven't copied anything? Skip zeroing, size extending, dirtying. */ + if (!copied) + goto unlock; + if (!PageUptodate(page)) { /* Zero any unwritten bytes at the end of the page */ size_t endoff = (pos + copied) & ~PAGE_CACHE_MASK; @@ -2007,6 +2011,8 @@ static int fuse_write_end(struct file *file, struct address_space *mapping, fuse_write_update_size(inode, pos + copied); set_page_dirty(page); + +unlock: unlock_page(page); page_cache_release(page); |