Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-09 14:43:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xfs: Don't clear SGID when inheriting ACLs

Browse Source 
When new directory 'DIR1' is created in a directory 'DIR0' with SGID bit
set, DIR1 is expected to have SGID bit set (and owning group equal to
the owning group of 'DIR0'). However when 'DIR0' also has some default
ACLs that 'DIR1' inherits, setting these ACLs will result in SGID bit on
'DIR1' to get cleared if user is not member of the owning group.

Fix the problem by calling __xfs_set_acl() instead of xfs_set_acl() when
setting up inode in xfs_generic_create(). That prevents SGID bit
clearing and mode is properly set by posix_acl_create() anyway. We also
reorder arguments of __xfs_set_acl() to match the ordering of
xfs_set_acl() to make things consistent.

Fixes: 073931017b49d9458aa351605b43a7e34598caef
CC: stable@vger.kernel.org
CC: Darrick J. Wong <darrick.wong@oracle.com>
CC: linux-xfs@vger.kernel.org
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
This commit is contained in:
Jan Kara 2017-06-26 08:48:18 -07:00 committed by Darrick J. Wong
parent cf2cb7845d
commit 8ba358756a
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/xfs/xfs_acl.c
View File

@ -170,8 +170,8 @@ xfs_get_acl(struct inode *inode, int type)
return acl; return acl;
} }
STATIC int int
__xfs_set_acl(struct inode *inode, int type, struct posix_acl *acl) __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
{ {
struct xfs_inode *ip = XFS_I(inode); struct xfs_inode *ip = XFS_I(inode);
unsigned char *ea_name; unsigned char *ea_name;
@ -268,5 +268,5 @@ xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type)
} }
set_acl: set_acl:
return __xfs_set_acl(inode, type, acl); return __xfs_set_acl(inode, acl, type);
} }

1
fs/xfs/xfs_acl.h
View File

@ -24,6 +24,7 @@ struct posix_acl;
#ifdef CONFIG_XFS_POSIX_ACL #ifdef CONFIG_XFS_POSIX_ACL
extern struct posix_acl *xfs_get_acl(struct inode *inode, int type); extern struct posix_acl *xfs_get_acl(struct inode *inode, int type);
extern int xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type); extern int xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type);
extern int __xfs_set_acl(struct inode *inode, struct posix_acl *acl, int type);
#else #else
static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type) static inline struct posix_acl *xfs_get_acl(struct inode *inode, int type)
{ {

4
fs/xfs/xfs_iops.c
View File

@ -190,12 +190,12 @@ xfs_generic_create(
#ifdef CONFIG_XFS_POSIX_ACL #ifdef CONFIG_XFS_POSIX_ACL
if (default_acl) { if (default_acl) {
error = xfs_set_acl(inode, default_acl, ACL_TYPE_DEFAULT); error = __xfs_set_acl(inode, default_acl, ACL_TYPE_DEFAULT);
if (error) if (error)
goto out_cleanup_inode; goto out_cleanup_inode;
} }
if (acl) { if (acl) {
error = xfs_set_acl(inode, acl, ACL_TYPE_ACCESS); error = __xfs_set_acl(inode, acl, ACL_TYPE_ACCESS);
if (error) if (error)
goto out_cleanup_inode; goto out_cleanup_inode;
} }