This is a note to let you know that I've just added the patch titled
fs: add mode_strip_sgid() helper
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
fs-add-mode_strip_sgid-helper.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From stable+bounces-15650-greg=kroah.com@xxxxxxxxxxxxxxx Wed Jan 24 05:03:18 2024
From: Mahmoud Adam <mngyadam@xxxxxxxxxx>
Date: Wed, 24 Jan 2024 14:00:25 +0100
Subject: fs: add mode_strip_sgid() helper
To: <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: <viro@xxxxxxxxxxxxxxxxxx>, <xuyang2018.jy@xxxxxxxxxxx>, <stable@xxxxxxxxxxxxxxx>, <linux-nfs@xxxxxxxxxxxxxxx>, <--suppress-cc=body@xxxxxxxxxx>, "Darrick J . Wong" <djwong@xxxxxxxxxx>, Christian Brauner <brauner@xxxxxxxxxx>, Jeff Layton <jlayton@xxxxxxxxxx>, Amir Goldstein <amir73il@xxxxxxxxx>, Mahmoud Adam <mngyadam@xxxxxxxxxx>
Message-ID: <20240124130025.2292-2-mngyadam@xxxxxxxxxx>
From: Yang Xu <xuyang2018.jy@xxxxxxxxxxx>
commit 2b3416ceff5e6bd4922f6d1c61fb68113dd82302 upstream.
[remove userns argument of helper for 5.4.y backport]
Add a dedicated helper to handle the setgid bit when creating a new file
in a setgid directory. This is a preparatory patch for moving setgid
stripping into the vfs. The patch contains no functional changes.
Currently the setgid stripping logic is open-coded directly in
inode_init_owner() and the individual filesystems are responsible for
handling setgid inheritance. Since this has proven to be brittle as
evidenced by old issues we uncovered over the last months (see [1] to
[3] below) we will try to move this logic into the vfs.
Link: e014f37db1a2 ("xfs: use setattr_copy to set vfs inode attributes") [1]
Link: 01ea173e103e ("xfs: fix up non-directory creation in SGID directories") [2]
Link: fd84bfdddd16 ("ceph: fix up non-directory creation in SGID directories") [3]
Link: https://lore.kernel.org/r/1657779088-2242-1-git-send-email-xuyang2018.jy@xxxxxxxxxxx
Reviewed-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Reviewed-by: Christian Brauner (Microsoft) <brauner@xxxxxxxxxx>
Reviewed-and-Tested-by: Jeff Layton <jlayton@xxxxxxxxxx>
Signed-off-by: Yang Xu <xuyang2018.jy@xxxxxxxxxxx>
Signed-off-by: Christian Brauner (Microsoft) <brauner@xxxxxxxxxx>
Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
[commit 347750e1b69cef62966fbc5bd7dc579b4c00688a upstream
backported from 5.10.y, resolved context conflicts]
Signed-off-by: Mahmoud Adam <mngyadam@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/inode.c | 34 ++++++++++++++++++++++++++++++----
include/linux/fs.h | 1 +
2 files changed, 31 insertions(+), 4 deletions(-)
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -2100,10 +2100,8 @@ void inode_init_owner(struct inode *inod
/* Directories are special, and always inherit S_ISGID */
if (S_ISDIR(mode))
mode |= S_ISGID;
- else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) &&
- !in_group_p(inode->i_gid) &&
- !capable_wrt_inode_uidgid(dir, CAP_FSETID))
- mode &= ~S_ISGID;
+ else
+ mode = mode_strip_sgid(dir, mode);
} else
inode->i_gid = current_fsgid();
inode->i_mode = mode;
@@ -2359,3 +2357,31 @@ int vfs_ioc_fssetxattr_check(struct inod
return 0;
}
EXPORT_SYMBOL(vfs_ioc_fssetxattr_check);
+
+/**
+ * mode_strip_sgid - handle the sgid bit for non-directories
+ * @dir: parent directory inode
+ * @mode: mode of the file to be created in @dir
+ *
+ * If the @mode of the new file has both the S_ISGID and S_IXGRP bit
+ * raised and @dir has the S_ISGID bit raised ensure that the caller is
+ * either in the group of the parent directory or they have CAP_FSETID
+ * in their user namespace and are privileged over the parent directory.
+ * In all other cases, strip the S_ISGID bit from @mode.
+ *
+ * Return: the new mode to use for the file
+ */
+umode_t mode_strip_sgid(const struct inode *dir, umode_t mode)
+{
+ if ((mode & (S_ISGID | S_IXGRP)) != (S_ISGID | S_IXGRP))
+ return mode;
+ if (S_ISDIR(mode) || !dir || !(dir->i_mode & S_ISGID))
+ return mode;
+ if (in_group_p(dir->i_gid))
+ return mode;
+ if (capable_wrt_inode_uidgid(dir, CAP_FSETID))
+ return mode;
+
+ return mode & ~S_ISGID;
+}
+EXPORT_SYMBOL(mode_strip_sgid);
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1743,6 +1743,7 @@ extern long compat_ptr_ioctl(struct file
extern void inode_init_owner(struct inode *inode, const struct inode *dir,
umode_t mode);
extern bool may_open_dev(const struct path *path);
+umode_t mode_strip_sgid(const struct inode *dir, umode_t mode);
/*
* VFS FS_IOC_FIEMAP helper definitions.
*/
Patches currently in stable-queue which might be from kroah.com@xxxxxxxxxxxxxxx are
queue-5.4/fs-move-s_isgid-stripping-into-the-vfs_-helpers.patch
queue-5.4/fs-add-mode_strip_sgid-helper.patch
