From 91be6b827527294faa745d7a61ba48534b4092f0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 13 Jul 2018 15:36:16 +0200 Subject: [PATCH] 4.14-stable patches added patches: fix-up-non-directory-creation-in-sgid-directories.patch --- ...rectory-creation-in-sgid-directories.patch | 47 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 48 insertions(+) create mode 100644 queue-4.14/fix-up-non-directory-creation-in-sgid-directories.patch diff --git a/queue-4.14/fix-up-non-directory-creation-in-sgid-directories.patch b/queue-4.14/fix-up-non-directory-creation-in-sgid-directories.patch new file mode 100644 index 00000000000..105b36384b2 --- /dev/null +++ b/queue-4.14/fix-up-non-directory-creation-in-sgid-directories.patch @@ -0,0 +1,47 @@ +From 0fa3ecd87848c9c93c2c828ef4c3a8ca36ce46c7 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Tue, 3 Jul 2018 17:10:19 -0700 +Subject: Fix up non-directory creation in SGID directories + +From: Linus Torvalds + +commit 0fa3ecd87848c9c93c2c828ef4c3a8ca36ce46c7 upstream. + +sgid directories have special semantics, making newly created files in +the directory belong to the group of the directory, and newly created +subdirectories will also become sgid. This is historically used for +group-shared directories. + +But group directories writable by non-group members should not imply +that such non-group members can magically join the group, so make sure +to clear the sgid bit on non-directories for non-members (but remember +that sgid without group execute means "mandatory locking", just to +confuse things even more). + +Reported-by: Jann Horn +Cc: Andy Lutomirski +Cc: Al Viro +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + fs/inode.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/fs/inode.c ++++ b/fs/inode.c +@@ -2006,8 +2006,14 @@ void inode_init_owner(struct inode *inod + inode->i_uid = current_fsuid(); + if (dir && dir->i_mode & S_ISGID) { + inode->i_gid = dir->i_gid; ++ ++ /* 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 + inode->i_gid = current_fsgid(); + inode->i_mode = mode; diff --git a/queue-4.14/series b/queue-4.14/series index da803db4650..b956350d7ea 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -21,3 +21,4 @@ usb-quirks-add-delay-quirks-for-corsair-strafe.patch xhci-xhci-mem-off-by-one-in-xhci_stream_id_to_ring.patch devpts-hoist-out-check-for-devpts_super_magic.patch devpts-resolve-devpts-bind-mounts.patch +fix-up-non-directory-creation-in-sgid-directories.patch -- 2.47.3