remove ext3 xattr permission checks
PATCH 5/8 remove ext3 xattr permission checks
remove checks now in the VFS
Signed-off-by Christoph Hellwig <[email protected]>
fs/ext3/xattr.c +0 -4
@@ -946,10 +946,6 @@ };int error; -if (IS_RDONLY (inode)) -return -EROFS ; -if (IS_IMMUTABLE (inode) ||IS_APPEND (inode)) -return -EPERM ;if (!name)return -EINVAL ;if (strlen (name) >255 )
fs/ext3/xattr_trusted.c +0 -4
@@ -39,8 +39,6 @@ {if (strcmp (name,"" ) ==0 )return -EINVAL ; -if (!capable (CAP_SYS_ADMIN )) -return -EPERM ;return ext3_xattr_get (inode,EXT3_XATTR_INDEX_TRUSTED , name, buffer, size); }
@@ -51,8 +49,6 @@ {if (strcmp (name,"" ) ==0 )return -EINVAL ; -if (!capable (CAP_SYS_ADMIN )) -return -EPERM ;return ext3_xattr_set (inode,EXT3_XATTR_INDEX_TRUSTED , name, value, size, flags); }
fs/ext3/xattr_user.c +0 -15
@@ -37,16 +37,10 @@ ext3_xattr_user_get(struct inode *inode, const char *name, void *buffer, size_t size) { - int error; - if (strcmp(name, "") == 0) return -EINVAL; if (!test_opt(inode->i_sb, XATTR_USER)) return -EOPNOTSUPP; - error =permission (inode,MAY_READ ,NULL ); -if (error) -return error; - return ext3_xattr_get(inode, EXT3_XATTR_INDEX_USER, name, buffer, size); }
@@ -54,19 +48,10 @@ ext3_xattr_user_set(struct inode *inode, const char *name, const void *value, size_t size, int flags) { - int error; - if (strcmp(name, "") == 0) return -EINVAL;if (!test_opt (inode->i_sb,XATTR_USER ))return -EOPNOTSUPP ; -if ( !S_ISREG (inode->i_mode) && - (!S_ISDIR (inode->i_mode) || inode->i_mode &S_ISVTX )) -return -EPERM ; - error =permission (inode,MAY_WRITE ,NULL ); -if (error) -return error; -return ext3_xattr_set (inode,EXT3_XATTR_INDEX_USER , name, value, size, flags); }