fuse2fs: propagate default ACLs to new children

generic/319 points out that we don't propagate the default ACL from a
directory into new children.  Do that, since that's expected behavior.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/174786678048.1383760.1562421474540065349.stgit@frogsfrogsfrogs
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index a521068ee2dd8d2b9922f8cb29eb704674efad97..c65f312610040618d1709d649689748b7bdb2c24 100644 (file)
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -912,6 +912,96 @@ out:
        return ret;
 }
 
+static int __getxattr(struct fuse2fs *ff, ext2_ino_t ino, const char *name,
+                     void **value, size_t *value_len)
+{
+       ext2_filsys fs = ff->fs;
+       struct ext2_xattr_handle *h;
+       errcode_t err;
+       int ret = 0;
+
+       err = ext2fs_xattrs_open(fs, ino, &h);
+       if (err)
+               return translate_error(fs, ino, err);
+
+       err = ext2fs_xattrs_read(h);
+       if (err) {
+               ret = translate_error(fs, ino, err);
+               goto out_close;
+       }
+
+       err = ext2fs_xattr_get(h, name, value, value_len);
+       if (err) {
+               ret = translate_error(fs, ino, err);
+               goto out_close;
+       }
+
+out_close:
+       err = ext2fs_xattrs_close(&h);
+       if (err && !ret)
+               ret = translate_error(fs, ino, err);
+       return ret;
+}
+
+static int __setxattr(struct fuse2fs *ff, ext2_ino_t ino, const char *name,
+                     void *value, size_t valuelen)
+{
+       ext2_filsys fs = ff->fs;
+       struct ext2_xattr_handle *h;
+       errcode_t err;
+       int ret = 0;
+
+       err = ext2fs_xattrs_open(fs, ino, &h);
+       if (err)
+               return translate_error(fs, ino, err);
+
+       err = ext2fs_xattrs_read(h);
+       if (err) {
+               ret = translate_error(fs, ino, err);
+               goto out_close;
+       }
+
+       err = ext2fs_xattr_set(h, name, value, valuelen);
+       if (err) {
+               ret = translate_error(fs, ino, err);
+               goto out_close;
+       }
+
+out_close:
+       err = ext2fs_xattrs_close(&h);
+       if (err && !ret)
+               ret = translate_error(fs, ino, err);
+       return ret;
+}
+
+static int propagate_default_acls(struct fuse2fs *ff, ext2_ino_t parent,
+                                 ext2_ino_t child)
+{
+       void *def;
+       size_t deflen;
+       int ret;
+
+       if (!ff->acl)
+               return 0;
+
+       ret = __getxattr(ff, parent, XATTR_NAME_POSIX_ACL_DEFAULT, &def,
+                        &deflen);
+       switch (ret) {
+       case -ENODATA:
+       case -ENOENT:
+               /* no default acl */
+               return 0;
+       case 0:
+               break;
+       default:
+               return ret;
+       }
+
+       ret = __setxattr(ff, child, XATTR_NAME_POSIX_ACL_DEFAULT, def, deflen);
+       ext2fs_free_mem(&def);
+       return ret;
+}
+
 static int op_mknod(const char *path, mode_t mode, dev_t dev)
 {
        struct fuse_context *ctxt = fuse_get_context();
@@ -1035,6 +1125,9 @@ static int op_mknod(const char *path, mode_t mode, dev_t dev)
 
        ext2fs_inode_alloc_stats2(fs, child, 1, 0);
 
+       ret = propagate_default_acls(ff, parent, child);
+       if (ret)
+               goto out2;
 out2:
        pthread_mutex_unlock(&ff->bfl);
 out:
@@ -1176,6 +1269,10 @@ static int op_mkdir(const char *path, mode_t mode)
                goto out3;
        }
 
+       ret = propagate_default_acls(ff, parent, child);
+       if (ret)
+               goto out3;
+
 out3:
        ext2fs_free_mem(&block);
 out2:
@@ -2600,7 +2697,6 @@ static int op_getxattr(const char *path, const char *key, char *value,
        struct fuse_context *ctxt = fuse_get_context();
        struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
        ext2_filsys fs;
-       struct ext2_xattr_handle *h;
        void *ptr;
        size_t plen;
        ext2_ino_t ino;
@@ -2629,23 +2725,9 @@ static int op_getxattr(const char *path, const char *key, char *value,
        if (ret)
                goto out;
 
-       err = ext2fs_xattrs_open(fs, ino, &h);
-       if (err) {
-               ret = translate_error(fs, ino, err);
+       ret = __getxattr(ff, ino, key, &ptr, &plen);
+       if (ret)
                goto out;
-       }
-
-       err = ext2fs_xattrs_read(h);
-       if (err) {
-               ret = translate_error(fs, ino, err);
-               goto out2;
-       }
-
-       err = ext2fs_xattr_get(h, key, &ptr, &plen);
-       if (err) {
-               ret = translate_error(fs, ino, err);
-               goto out2;
-       }
 
        if (!len) {
                ret = plen;
@@ -2657,10 +2739,6 @@ static int op_getxattr(const char *path, const char *key, char *value,
        }
 
        ext2fs_free_mem(&ptr);
-out2:
-       err = ext2fs_xattrs_close(&h);
-       if (err && !ret)
-               ret = translate_error(fs, ino, err);
 out:
        pthread_mutex_unlock(&ff->bfl);
 
@@ -3199,6 +3277,10 @@ static int op_create(const char *path, mode_t mode, struct fuse_file_info *fp)
 
        ext2fs_inode_alloc_stats2(fs, child, 1, 0);
 
+       ret = propagate_default_acls(ff, parent, child);
+       if (ret)
+               goto out2;
+
        ret = __op_open(ff, path, fp);
        if (ret)
                goto out2;