Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

Pull fuse bugfixes from Miklos Szeredi:
 "Just a bunch of bugfixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: use list_for_each_entry() for list traversing
  fuse: readdir: check for slash in names
  fuse: hotfix truncate_pagecache() issue
  fuse: invalidate inode attributes on xattr modification
  fuse: postpone end_page_writeback() in fuse_writepage_locked()

1 files changed, 14 insertions, 1 deletions

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 0e6961aae6c0..3ac91086f41f 100644
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1177,6 +1177,8 @@ static int parse_dirfile(char *buf, size_t nbytes, struct file *file,
                         return -EIO;
                 if (reclen > nbytes)
                         break;
+                if (memchr(dirent->name, '/', dirent->namelen) != NULL)
+                        return -EIO;
 
                 if (!dir_emit(ctx, dirent->name, dirent->namelen,
                                dirent->ino, dirent->type))
@@ -1315,6 +1317,8 @@ static int parse_dirplusfile(char *buf, size_t nbytes, struct file *file,
                         return -EIO;
                 if (reclen > nbytes)
                         break;
+                if (memchr(dirent->name, '/', dirent->namelen) != NULL)
+                        return -EIO;
 
                 if (!over) {
                         /* We fill entries into dstbuf only as much as
@@ -1585,6 +1589,7 @@ int fuse_do_setattr(struct inode *inode, struct iattr *attr,
                     struct file *file)
 {
         struct fuse_conn *fc = get_fuse_conn(inode);
+        struct fuse_inode *fi = get_fuse_inode(inode);
         struct fuse_req *req;
         struct fuse_setattr_in inarg;
         struct fuse_attr_out outarg;
@@ -1612,8 +1617,10 @@ int fuse_do_setattr(struct inode *inode, struct iattr *attr,
         if (IS_ERR(req))
                 return PTR_ERR(req);
 
-        if (is_truncate)
+        if (is_truncate) {
                 fuse_set_nowrite(inode);
+                set_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);
+        }
 
         memset(&inarg, 0, sizeof(inarg));
         memset(&outarg, 0, sizeof(outarg));
@@ -1675,12 +1682,14 @@ int fuse_do_setattr(struct inode *inode, struct iattr *attr,
                 invalidate_inode_pages2(inode->i_mapping);
         }
 
+        clear_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);
         return 0;
 
 error:
         if (is_truncate)
                 fuse_release_nowrite(inode);
 
+        clear_bit(FUSE_I_SIZE_UNSTABLE, &fi->state);
         return err;
 }
 
@@ -1744,6 +1753,8 @@ static int fuse_setxattr(struct dentry *entry, const char *name,
                 fc->no_setxattr = 1;
                 err = -EOPNOTSUPP;
         }
+        if (!err)
+                fuse_invalidate_attr(inode);
         return err;
 }
 
@@ -1873,6 +1884,8 @@ static int fuse_removexattr(struct dentry *entry, const char *name)
                 fc->no_removexattr = 1;
                 err = -EOPNOTSUPP;
         }
+        if (!err)
+                fuse_invalidate_attr(inode);
         return err;
 }