Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: JFS: Remove redundant xattr permission checking
This commit is contained in:
commit
aaa9b97139
1 changed files with 5 additions and 4 deletions
|
@ -756,6 +756,11 @@ static int can_set_system_xattr(struct inode *inode, const char *name,
|
|||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
/*
|
||||
* Most of the permission checking is done by xattr_permission in the vfs.
|
||||
* The local file system is responsible for handling the system.* namespace.
|
||||
* We also need to verify that this is a namespace that we recognize.
|
||||
*/
|
||||
static int can_set_xattr(struct inode *inode, const char *name,
|
||||
const void *value, size_t value_len)
|
||||
{
|
||||
|
@ -771,10 +776,6 @@ static int can_set_xattr(struct inode *inode, const char *name,
|
|||
strncmp(name, XATTR_OS2_PREFIX, XATTR_OS2_PREFIX_LEN))
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
if (!S_ISREG(inode->i_mode) &&
|
||||
(!S_ISDIR(inode->i_mode) || inode->i_mode &S_ISVTX))
|
||||
return -EPERM;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue