]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
fuse: fix fuse_write_end() if zero bytes were copied
authorMiklos Szeredi <mszeredi@redhat.com>
Thu, 18 Aug 2016 07:10:44 +0000 (09:10 +0200)
committerMiklos Szeredi <mszeredi@redhat.com>
Tue, 15 Nov 2016 11:34:21 +0000 (12:34 +0100)
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>
fs/fuse/file.c

index abc66a6237fd0ebd9bbafbf893b21b97874d01dc..2401c5dabb2a227b6511be01b1589ffa5180e636 100644 (file)
@@ -1985,6 +1985,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_MASK;
@@ -1995,6 +1999,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);
        put_page(page);