mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-04-17 13:47:40 +07:00
[PATCH] remove ext3 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>
This commit is contained in:
parent
267fd05791
commit
c37ef806a3
@ -946,10 +946,6 @@ ext3_xattr_set_handle(handle_t *handle, struct inode *inode, int name_index,
|
|||||||
};
|
};
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
if (IS_RDONLY(inode))
|
|
||||||
return -EROFS;
|
|
||||||
if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
|
|
||||||
return -EPERM;
|
|
||||||
if (!name)
|
if (!name)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (strlen(name) > 255)
|
if (strlen(name) > 255)
|
||||||
|
@ -39,8 +39,6 @@ ext3_xattr_trusted_get(struct inode *inode, const char *name,
|
|||||||
{
|
{
|
||||||
if (strcmp(name, "") == 0)
|
if (strcmp(name, "") == 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
|
||||||
return -EPERM;
|
|
||||||
return ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED, name,
|
return ext3_xattr_get(inode, EXT3_XATTR_INDEX_TRUSTED, name,
|
||||||
buffer, size);
|
buffer, size);
|
||||||
}
|
}
|
||||||
@ -51,8 +49,6 @@ ext3_xattr_trusted_set(struct inode *inode, const char *name,
|
|||||||
{
|
{
|
||||||
if (strcmp(name, "") == 0)
|
if (strcmp(name, "") == 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (!capable(CAP_SYS_ADMIN))
|
|
||||||
return -EPERM;
|
|
||||||
return ext3_xattr_set(inode, EXT3_XATTR_INDEX_TRUSTED, name,
|
return ext3_xattr_set(inode, EXT3_XATTR_INDEX_TRUSTED, name,
|
||||||
value, size, flags);
|
value, size, flags);
|
||||||
}
|
}
|
||||||
|
@ -37,16 +37,10 @@ static int
|
|||||||
ext3_xattr_user_get(struct inode *inode, const char *name,
|
ext3_xattr_user_get(struct inode *inode, const char *name,
|
||||||
void *buffer, size_t size)
|
void *buffer, size_t size)
|
||||||
{
|
{
|
||||||
int error;
|
|
||||||
|
|
||||||
if (strcmp(name, "") == 0)
|
if (strcmp(name, "") == 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (!test_opt(inode->i_sb, XATTR_USER))
|
if (!test_opt(inode->i_sb, XATTR_USER))
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
error = permission(inode, MAY_READ, NULL);
|
|
||||||
if (error)
|
|
||||||
return error;
|
|
||||||
|
|
||||||
return ext3_xattr_get(inode, EXT3_XATTR_INDEX_USER, name, buffer, size);
|
return ext3_xattr_get(inode, EXT3_XATTR_INDEX_USER, name, buffer, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,19 +48,10 @@ static int
|
|||||||
ext3_xattr_user_set(struct inode *inode, const char *name,
|
ext3_xattr_user_set(struct inode *inode, const char *name,
|
||||||
const void *value, size_t size, int flags)
|
const void *value, size_t size, int flags)
|
||||||
{
|
{
|
||||||
int error;
|
|
||||||
|
|
||||||
if (strcmp(name, "") == 0)
|
if (strcmp(name, "") == 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (!test_opt(inode->i_sb, XATTR_USER))
|
if (!test_opt(inode->i_sb, XATTR_USER))
|
||||||
return -EOPNOTSUPP;
|
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,
|
return ext3_xattr_set(inode, EXT3_XATTR_INDEX_USER, name,
|
||||||
value, size, flags);
|
value, size, flags);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user