diff options
Diffstat (limited to 'fs/ext3/xattr_trusted.c')
-rw-r--r-- | fs/ext3/xattr_trusted.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/ext3/xattr_trusted.c b/fs/ext3/xattr_trusted.c index f68bfd1cf519..86d91f1186dc 100644 --- a/fs/ext3/xattr_trusted.c +++ b/fs/ext3/xattr_trusted.c | |||
@@ -7,6 +7,7 @@ | |||
7 | 7 | ||
8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
9 | #include <linux/string.h> | 9 | #include <linux/string.h> |
10 | #include <linux/capability.h> | ||
10 | #include <linux/fs.h> | 11 | #include <linux/fs.h> |
11 | #include <linux/smp_lock.h> | 12 | #include <linux/smp_lock.h> |
12 | #include <linux/ext3_jbd.h> | 13 | #include <linux/ext3_jbd.h> |
@@ -39,8 +40,6 @@ ext3_xattr_trusted_get(struct inode *inode, const char *name, | |||
39 | { | 40 | { |
40 | if (strcmp(name, "") == 0) | 41 | if (strcmp(name, "") == 0) |
41 | return -EINVAL; | 42 | return -EINVAL; |
42 | if (!capable(CAP_SYS_ADMIN)) | ||
43 | return -EPERM; | ||
44 | return ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED, name, | 43 | return ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED, name, |
45 | buffer, size); | 44 | buffer, size); |
46 | } | 45 | } |
@@ -51,8 +50,6 @@ ext3_xattr_trusted_set(struct inode *inode, const char *name, | |||
51 | { | 50 | { |
52 | if (strcmp(name, "") == 0) | 51 | if (strcmp(name, "") == 0) |
53 | return -EINVAL; | 52 | return -EINVAL; |
54 | if (!capable(CAP_SYS_ADMIN)) | ||
55 | return -EPERM; | ||
56 | return ext3_xattr_set(inode, EXT3_XATTR_INDEX_TRUSTED, name, | 53 | return ext3_xattr_set(inode, EXT3_XATTR_INDEX_TRUSTED, name, |
57 | value, size, flags); | 54 | value, size, flags); |
58 | } | 55 | } |