Btrfs: fix incorrect inode acl reset
PATCH 1/1 Btrfs: fix incorrect inode acl reset
When a directory has a default ACL and a subdirectory is created under that directory, btrfs_init_acl() is called when the subdirectory's inode is created to initialize the inode's ACL (inherited from the parent directory) but it was clearing the ACL from the inode after setting it if posix_acl_create() returned success, instead of clearing it only if it returned an error.
To reproduce this issue:
$ mkfs.btrfs -f /dev/loop0 $ mount /dev/loop0 /mnt $ mkdir /mnt/acl $ setfacl -d --set u::rwx,g::rwx,o::- /mnt/acl $ getfacl /mnt/acl user::rwx group::rwx other::r-x default:user::rwx default:group::rwx default:other::---
$ mkdir /mnt/acl/dir1 $ getfacl /mnt/acl/dir1 user::rwx group::rwx other::---
After unmounting and mounting again the filesystem, fgetacl returned the expected ACL:
$ umount /mnt/acl $ mount /dev/loop0 /mnt $ getfacl /mnt/acl/dir1 user::rwx group::rwx other::--- default:user::rwx default:group::rwx default:other::---
Meaning that the underlying xattr was persisted.
--- fs/btrfs/acl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/acl.c +1 -1
@@ -229,7 +229,7 @@ int btrfs_init_acl(struct btrfs_trans_handle *trans,if (ret >0 ) {/* we need an acl */ ret =btrfs_set_acl (trans, inode, acl,ACL_TYPE_ACCESS ); - }else { + }else if (ret <0 ) {cache_no_acl (inode); } }else {
Signature · 1 line
1.7.9.5
Quoted 40 lines · Filipe David Borba Manana
When a directory has a default ACL and a subdirectory is created under that directory,
btrfs_init_acl()is called when the subdirectory's inode is created to initialize the inode's ACL (inherited from the parent directory) but it was clearing the ACL from the inode after setting it ifposix_acl_create()returned success, instead of clearing it only if it returned an error.To reproduce this issue:
$ mkfs.btrfs -f /dev/loop0 $ mount /dev/loop0 /mnt $ mkdir /mnt/acl $ setfacl -d --set u::rwx,g::rwx,o::- /mnt/acl $ getfacl /mnt/acl user::rwx group::rwx other::r-x default:user::rwx default:group::rwx default:other::---$ mkdir /mnt/acl/dir1 $ getfacl /mnt/acl/dir1 user::rwx group::rwx other::---After unmounting and mounting again the filesystem, fgetacl returned the expected ACL:
$ umount /mnt/acl $ mount /dev/loop0 /mnt $ getfacl /mnt/acl/dir1 user::rwx group::rwx other::--- default:user::rwx default:group::rwx default:other::---
Quoted 2 lines
Meaning that the underlying xattr was persisted.
Can you put this into an xfstest please? Thanks,
Josef
Quoted 41 lines · Josef Bacik
Quoted 40 lines · Filipe David Borba Manana
When a directory has a default ACL and a subdirectory is created under that directory,
btrfs_init_acl()is called when the subdirectory's inode is created to initialize the inode's ACL (inherited from the parent directory) but it was clearing the ACL from the inode after setting it ifposix_acl_create()returned success, instead of clearing it only if it returned an error.To reproduce this issue:
$ mkfs.btrfs -f /dev/loop0 $ mount /dev/loop0 /mnt $ mkdir /mnt/acl $ setfacl -d --set u::rwx,g::rwx,o::- /mnt/acl $ getfacl /mnt/acl user::rwx group::rwx other::r-x default:user::rwx default:group::rwx default:other::---$ mkdir /mnt/acl/dir1 $ getfacl /mnt/acl/dir1 user::rwx group::rwx other::---After unmounting and mounting again the filesystem, fgetacl returned the expected ACL:
$ umount /mnt/acl $ mount /dev/loop0 /mnt $ getfacl /mnt/acl/dir1 user::rwx group::rwx other::--- default:user::rwx default:group::rwx default:other::---
Quoted 4 lines
Quoted 2 lines
Meaning that the underlying xattr was persisted.
Can you put this into an xfstest please? Thanks,
A new one or just add it to an existing one (and which)?
Quoted 2 lines
Josef
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."
Quoted 3 lines · Filipe David Manana
Quoted 1 line
Can you put this into an xfstest please? Thanks,
A new one or just add it to an existing one (and which)?
There's xfstests/shared/051 that tests ACLs, but is run only against xfs and udf. I haven't verified it wrt btrfs, but maybe this test catches the bug. If not, please add a new test into the 'generic' category.
thanks,
david
Quoted 8 lines · David Sterba
Quoted 3 lines · Filipe David Manana
Quoted 1 line
Can you put this into an xfstest please? Thanks,
A new one or just add it to an existing one (and which)?
There's xfstests/shared/051 that tests ACLs, but is run only against xfs and udf. I haven't verified it wrt btrfs, but maybe this test catches the bug. If not, please add a new test into the 'generic' category.
I adapted shared/051 to make it work with btrfs too. However the test as it is, doesn't trigger the default ACL inheritance issue, so I added the steps from the commit message to the test.
Thanks David.
Quoted 3 lines
thanks,
david
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."