FAILED: patch "[PATCH] ceph: fix up non-directory creation in SGID directories" failed to apply to 5.10-stable tree

PATCH [email protected] 3 participants 7 messages Dec 17, 2021 – Dec 23, 2021

Subsystems (2)

Stable branch Ceph client

lore

Share & tools

lore

[email protected]

author maintainer

2021-12-17 13:51 UTC #0 lore raw

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From fd84bfdddd169c219c3a637889a8b87f70a072c2 Mon Sep 17 00:00:00 2001
From: Christian Brauner <[email protected]>
Date: Mon, 29 Nov 2021 12:16:39 +0100
Subject: [PATCH] ceph: fix up non-directory creation in SGID directories

Ceph 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 (cf. [1]).

Update ceph to strip the SGID bit just as inode_init_owner would.

This bug was detected by the mapped mount testsuite in [3]. The testsuite tests all core VFS functionality and semantics with and without mapped mounts. That is to say it functions as a generic VFS testsuite in addition to a mapped mount testsuite. While working on mapped mount support for ceph, SIGD inheritance was the only failing test for ceph after the port.

The same bug was detected by the mapped mount testsuite in XFS in January 2021 (cf. [2]).

[1]: commit 0fa3ecd87848 ("Fix up non-directory creation in SGID directories") [2]: commit 01ea173e103e ("xfs: fix up non-directory creation in SGID directories") [3]: https://git.kernel.org/fs/xfs/xfstests-dev.git

Cc [email protected]

Signed-off-by Christian Brauner <[email protected]>

Reviewed-by Jeff Layton <[email protected]>

Signed-off-by Ilya Dryomov <[email protected]>

fs/ceph/file.c +15 -3

index b24442e27e4e..c138e8126286 100644
@@ -605,13 +605,25 @@ static int ceph_finish_async_create(struct inode *dir, struct dentry *dentry,
 	in.cap.realm = cpu_to_le64(ci->i_snap_realm->ino);
 	in.cap.flags = CEPH_CAP_FLAG_AUTH;
 	in.ctime = in.mtime = in.atime = iinfo.btime;
-	in.mode = cpu_to_le32((u32)mode);
 	in.truncate_seq = cpu_to_le32(1);
 	in.truncate_size = cpu_to_le64(-1ULL);
 	in.xattr_version = cpu_to_le64(1);
 	in.uid = cpu_to_le32(from_kuid(&init_user_ns, current_fsuid()));
-	in.gid = cpu_to_le32(from_kgid(&init_user_ns, dir->i_mode & S_ISGID ?
-				dir->i_gid : current_fsgid()));
+	if (dir->i_mode & S_ISGID) {
+		in.gid = cpu_to_le32(from_kgid(&init_user_ns, dir->i_gid));
+
+		/* Directories always inherit the setgid bit. */
+		if (S_ISDIR(mode))
+			mode |= S_ISGID;
+		else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) &&
+			 !in_group_p(dir->i_gid) &&
+			 !capable_wrt_inode_uidgid(&init_user_ns, dir, CAP_FSETID))
+			mode &= ~S_ISGID;
+	} else {
+		in.gid = cpu_to_le32(from_kgid(&init_user_ns, current_fsgid()));
+	}
+	in.mode = cpu_to_le32((u32)mode);
+
 	in.nlink = cpu_to_le32(1);
 	in.max_size = cpu_to_le64(lo->stripe_unit);

Christian Brauner

2021-12-17 14:23 UTC #1 lore raw

Quoted 5 lines · On Fri, Dec 17, 2021 at 02:51:46PM +0100, [email protected] wrote:

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Oh? I just applied the patch on top of:

commit 272aedd4a305 ("Linux 5.10.87")

without any issues. Not sure what failed for you.

Thanks!
Christian

Greg KH

author maintainer

2021-12-17 15:04 UTC #2 lore raw

Quoted 7 lines · Christian Brauner

Quoted 5 lines · On Fri, Dec 17, 2021 at 02:51:46PM +0100, [email protected] wrote:
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 5 lines

Oh? I just applied the patch on top of:
commit 272aedd4a305 ("Linux 5.10.87")
without any issues. Not sure what failed for you.

It fails to build :(

Jeff Layton

2021-12-17 15:55 UTC #3 lore raw

Quoted 8 lines · Greg KH

Quoted 7 lines · Christian Brauner
Quoted 5 lines · On Fri, Dec 17, 2021 at 02:51:46PM +0100, [email protected] wrote:
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 7 lines

Quoted 5 lines
Oh? I just applied the patch on top of:
commit 272aedd4a305 ("Linux 5.10.87")
without any issues. Not sure what failed for you.
It fails to build :(

I think the issue is probably that capable_wrt_inode_uidgid in kernels of that era didn't take a userns arg. I had to do a similar fixup for the RHEL8 backport.

Signature · 1 line

Jeff Layton <[email protected]>

Christian Brauner

2021-12-17 15:58 UTC #4 lore raw

Quoted 13 lines · Jeff Layton

Quoted 12 lines · Greg KH
Quoted 11 lines · Christian Brauner
Quoted 5 lines · On Fri, Dec 17, 2021 at 02:51:46PM +0100, [email protected] wrote:
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Oh? I just applied the patch on top of:
commit 272aedd4a305 ("Linux 5.10.87")

Quoted 7 lines

Quoted 3 lines
Quoted 1 line
without any issues. Not sure what failed for you.
It fails to build :(
I think the issue is probably that capable_wrt_inode_uidgid in kernels of that era didn't take a userns arg. I had to do a similar fixup for the RHEL8 backport.

Yes, I think this is:

fs/ceph/file.c +1 -1

index 5eddee27a688..8ed881fd7440 100644
@@ -615,7 +615,7 @@ static int ceph_finish_async_create(struct inode *dir, struct dentry *dentry,
                        mode |= S_ISGID;
                else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) &&
                         !in_group_p(dir->i_gid) &&
-                        !capable_wrt_inode_uidgid(&init_user_ns, dir, CAP_FSETID))
+                        !capable_wrt_inode_uidgid(dir, CAP_FSETID))
                        mode &= ~S_ISGID;
        } else {
                in.gid = cpu_to_le32(from_kgid(&init_user_ns, current_fsgid()));

on top of my patch.

Thanks!
Christian

Greg KH

author maintainer

2021-12-20 10:52 UTC #5 lore raw

Quoted 38 lines · Christian Brauner

Quoted 13 lines · Jeff Layton
Quoted 12 lines · Greg KH
Quoted 11 lines · Christian Brauner
Quoted 5 lines · On Fri, Dec 17, 2021 at 02:51:46PM +0100, [email protected] wrote:
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Oh? I just applied the patch on top of:
commit 272aedd4a305 ("Linux 5.10.87")
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
without any issues. Not sure what failed for you.
It fails to build :(
I think the issue is probably that capable_wrt_inode_uidgid in kernels of that era didn't take a userns arg. I had to do a similar fixup for the RHEL8 backport.
Yes, I think this is:
fs/ceph/file.c +1 -1
index 5eddee27a688..8ed881fd7440 100644
@@ -615,7 +615,7 @@ static int ceph_finish_async_create(struct inode *dir, struct dentry *dentry,
                        mode |= S_ISGID;
                else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) &&
                         !in_group_p(dir->i_gid) &&
-                        !capable_wrt_inode_uidgid(&init_user_ns, dir, CAP_FSETID))
+                        !capable_wrt_inode_uidgid(dir, CAP_FSETID))
                        mode &= ~S_ISGID;
        } else {
                in.gid = cpu_to_le32(from_kgid(&init_user_ns, current_fsgid()));

Quoted 1 line

on top of my patch.

Can someone submit this in a format that I can apply it in?

thanks,

greg k-h

Christian Brauner

2021-12-23 09:59 UTC #6 lore raw

Quoted 39 lines · Greg KH

Quoted 38 lines · Christian Brauner
Quoted 13 lines · Jeff Layton
Quoted 12 lines · Greg KH
Quoted 11 lines · Christian Brauner
Quoted 5 lines · On Fri, Dec 17, 2021 at 02:51:46PM +0100, [email protected] wrote:
The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
Oh? I just applied the patch on top of:
commit 272aedd4a305 ("Linux 5.10.87")
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
without any issues. Not sure what failed for you.
It fails to build :(
I think the issue is probably that capable_wrt_inode_uidgid in kernels of that era didn't take a userns arg. I had to do a similar fixup for the RHEL8 backport.
Yes, I think this is:
fs/ceph/file.c +1 -1
index 5eddee27a688..8ed881fd7440 100644
@@ -615,7 +615,7 @@ static int ceph_finish_async_create(struct inode *dir, struct dentry *dentry,
                        mode |= S_ISGID;
                else if ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP) &&
                         !in_group_p(dir->i_gid) &&
-                        !capable_wrt_inode_uidgid(&init_user_ns, dir, CAP_FSETID))
+                        !capable_wrt_inode_uidgid(dir, CAP_FSETID))
                        mode &= ~S_ISGID;
        } else {
                in.gid = cpu_to_le32(from_kgid(&init_user_ns, current_fsgid()));

Quoted 3 lines

Quoted 1 line
on top of my patch.
Can someone submit this in a format that I can apply it in?

You should've gotten a mail:
https://lore.kernel.org/stable/[email protected]

I'm alredy on holidays so only checking my mails sporadically, sorry!