adjust_shared_perm(): leave g+s alone when the group does not matter
Julien Moutinho reports that in an environment where directory does not have BSD group semantics and requires the g+s to be set (aka FORCE_DIR_SET_GID), but the system forbids chmod() to touch the g+s bit, adjust_shared_perm() fails even when the repository is for private use with perm = 0600, because we unconditionally try to set the g+s bit. When we grant extra access based on group membership (i.e. the directory has either g+r or g+w bit set), which group the directory and its contents are owned by matters. But otherwise (e.g. perm is set to 0600, in Julien's case), flipping g+s bit is not necessary. Reported-by: Julien Moutinho <julm+git@sourcephile.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Oct 28, 2022 at 14:16 UTC
671bbf7b9da70bad0307d616e7f6717a28300ffc
1 file changed
+7
-1
path.c
+7
-1
@@ -901,7 +901,13 @@ int adjust_shared_perm(const char *path)
901
if (S_ISDIR(old_mode)) {
902
/* Copy read bits to execute bits */
903
new_mode |= (new_mode & 0444) >> 2;
904
- new_mode |= FORCE_DIR_SET_GID;
904
+
905
+ /*
906
+ * g+s matters only if any extra access is granted
907
+ * based on group membership.
908
+ */
909
+ if (FORCE_DIR_SET_GID && (new_mode & 060))
910
+ new_mode |= FORCE_DIR_SET_GID;
911
}
912
913
if (((old_mode ^ new_mode) & ~S_IFMT) &&