diff options
| author | Shi Weihua <shiwh@cn.fujitsu.com> | 2010-05-18 00:50:32 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2010-06-11 15:57:37 -0400 |
| commit | 2f26afba46f0ebf155cf9be746496a0304a5b7cf (patch) | |
| tree | 8127a4a101734efce3c0d0190754f180de05a599 | |
| parent | cf1e99a4e0daa4a5623cd71108509823b9ff2d30 (diff) | |
| download | linux-3.10-2f26afba46f0ebf155cf9be746496a0304a5b7cf.tar.gz linux-3.10-2f26afba46f0ebf155cf9be746496a0304a5b7cf.tar.bz2 linux-3.10-2f26afba46f0ebf155cf9be746496a0304a5b7cf.zip | |
Btrfs: should add a permission check for setfacl
On btrfs, do the following
------------------
# su user1
# cd btrfs-part/
# touch aaa
# getfacl aaa
# file: aaa
# owner: user1
# group: user1
user::rw-
group::rw-
other::r--
# su user2
# cd btrfs-part/
# setfacl -m u::rwx aaa
# getfacl aaa
# file: aaa
# owner: user1
# group: user1
user::rwx <- successed to setfacl
group::rw-
other::r--
------------------
but we should prohibit it that user2 changing user1's acl.
In fact, on ext3 and other fs, a message occurs:
setfacl: aaa: Operation not permitted
This patch fixed it.
Signed-off-by: Shi Weihua <shiwh@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/acl.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c index 6ef7b26724e..6b4d0cca5c7 100644 --- a/fs/btrfs/acl.c +++ b/fs/btrfs/acl.c @@ -160,6 +160,9 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name, int ret; struct posix_acl *acl = NULL; + if (!is_owner_or_cap(dentry->d_inode)) + return -EPERM; + if (value) { acl = posix_acl_from_xattr(value, size); if (acl == NULL) { |