Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 06:02:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfs: fix up non-directory creation in SGID directories

Browse Source 
XFS always inherits the SGID bit if it is set on the parent inode, while
the generic inode_init_owner does not do this in a few cases where it can
create a possible security problem, see commit 0fa3ecd878
("Fix up non-directory creation in SGID directories") for details.

Switch XFS to use the generic helper for the normal path to fix this,
just keeping the simple field inheritance open coded for the case of the
non-sgid case with the bsdgrpid mount option.

Fixes: 1da177e4c3 ("Linux-2.6.12-rc2")
Reported-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
This commit is contained in:
Christoph Hellwig 2021-01-22 16:48:18 -08:00 committed by Darrick J. Wong
parent eaf92540a9
commit 01ea173e10
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/xfs/xfs_inode.c
View File

@ -775,6 +775,7 @@ xfs_init_new_inode(
prid_t prid, prid_t prid,
struct xfs_inode **ipp) struct xfs_inode **ipp)
{ {
struct inode *dir = pip ? VFS_I(pip) : NULL;
struct xfs_mount *mp = tp->t_mountp; struct xfs_mount *mp = tp->t_mountp;
struct xfs_inode *ip; struct xfs_inode *ip;
unsigned int flags; unsigned int flags;
@ -804,18 +805,17 @@ xfs_init_new_inode(
ASSERT(ip != NULL); ASSERT(ip != NULL);
inode = VFS_I(ip); inode = VFS_I(ip);
inode->i_mode = mode;
set_nlink(inode, nlink); set_nlink(inode, nlink);
inode->i_uid = current_fsuid();
inode->i_rdev = rdev; inode->i_rdev = rdev;
ip->i_d.di_projid = prid; ip->i_d.di_projid = prid;
if (pip && XFS_INHERIT_GID(pip)) { if (dir && !(dir->i_mode & S_ISGID) &&
inode->i_gid = VFS_I(pip)->i_gid; (mp->m_flags & XFS_MOUNT_GRPID)) {
if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode)) inode->i_uid = current_fsuid();
inode->i_mode |= S_ISGID; inode->i_gid = dir->i_gid;
inode->i_mode = mode;
} else { } else {
inode->i_gid = current_fsgid(); inode_init_owner(inode, dir, mode);
} }
/* /*