diff options
author | akpm@osdl.org <akpm@osdl.org> | 2006-01-09 23:51:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 11:01:30 -0500 |
commit | 267fd05791aafea3786494365a5d13d7923ef526 (patch) | |
tree | 01f46843a0095dfb80fd7686e27b94045d2a0ff9 /fs/ext2/xattr_user.c | |
parent | 44a0033f6d5f3e7e2fc37d7b44a1d105c70d4682 (diff) |
[PATCH] remove ext2 xattr permission checks
)
From: Christoph Hellwig <hch@lst.de>
remove checks now in the VFS
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/ext2/xattr_user.c')
-rw-r--r-- | fs/ext2/xattr_user.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fs/ext2/xattr_user.c b/fs/ext2/xattr_user.c index 0c03ea131a94..f383e7c3a7b5 100644 --- a/fs/ext2/xattr_user.c +++ b/fs/ext2/xattr_user.c | |||
@@ -35,16 +35,10 @@ static int | |||
35 | ext2_xattr_user_get(struct inode *inode, const char *name, | 35 | ext2_xattr_user_get(struct inode *inode, const char *name, |
36 | void *buffer, size_t size) | 36 | void *buffer, size_t size) |
37 | { | 37 | { |
38 | int error; | ||
39 | |||
40 | if (strcmp(name, "") == 0) | 38 | if (strcmp(name, "") == 0) |
41 | return -EINVAL; | 39 | return -EINVAL; |
42 | if (!test_opt(inode->i_sb, XATTR_USER)) | 40 | if (!test_opt(inode->i_sb, XATTR_USER)) |
43 | return -EOPNOTSUPP; | 41 | return -EOPNOTSUPP; |
44 | error = permission(inode, MAY_READ, NULL); | ||
45 | if (error) | ||
46 | return error; | ||
47 | |||
48 | return ext2_xattr_get(inode, EXT2_XATTR_INDEX_USER, name, buffer, size); | 42 | return ext2_xattr_get(inode, EXT2_XATTR_INDEX_USER, name, buffer, size); |
49 | } | 43 | } |
50 | 44 | ||
@@ -52,18 +46,10 @@ static int | |||
52 | ext2_xattr_user_set(struct inode *inode, const char *name, | 46 | ext2_xattr_user_set(struct inode *inode, const char *name, |
53 | const void *value, size_t size, int flags) | 47 | const void *value, size_t size, int flags) |
54 | { | 48 | { |
55 | int error; | ||
56 | |||
57 | if (strcmp(name, "") == 0) | 49 | if (strcmp(name, "") == 0) |
58 | return -EINVAL; | 50 | return -EINVAL; |
59 | if (!test_opt(inode->i_sb, XATTR_USER)) | 51 | if (!test_opt(inode->i_sb, XATTR_USER)) |
60 | return -EOPNOTSUPP; | 52 | return -EOPNOTSUPP; |
61 | if ( !S_ISREG(inode->i_mode) && | ||
62 | (!S_ISDIR(inode->i_mode) || inode->i_mode & S_ISVTX)) | ||
63 | return -EPERM; | ||
64 | error = permission(inode, MAY_WRITE, NULL); | ||
65 | if (error) | ||
66 | return error; | ||
67 | 53 | ||
68 | return ext2_xattr_set(inode, EXT2_XATTR_INDEX_USER, name, | 54 | return ext2_xattr_set(inode, EXT2_XATTR_INDEX_USER, name, |
69 | value, size, flags); | 55 | value, size, flags); |