Avoid setting S_ISGID on files in volumes.

Directories in volumes are set S_ISGID to ensure files created inside them inherit group ownership. Currently, files are also set S_ISGID however this is not relevant to the original intent, and indicates 'mandatory file locking' (stat(2)). With this commit, only directories are set S_ISGID.

Avoid setting S_ISGID on files in volumes.
67f31342 · Seth Jennings · dbc4121e · 67f31342
Commit 67f31342 authored Nov 07, 2016 by Seth Jennings
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

volume_linux.go pkg/volume/volume_linux.go +5 -1

No files found.
--- a/pkg/volume/volume_linux.go
+++ b/pkg/volume/volume_linux.go
@@ -71,7 +71,11 @@ func SetVolumeOwnership(mounter Mounter, fsGroup *int64) error {
 			mask = roMask
 		}

-		err = chmodRunner.Chmod(path, info.Mode()|mask|os.ModeSetgid)
+		if info.IsDir() {
+			mask |= os.ModeSetgid
+		}
+
+		err = chmodRunner.Chmod(path, info.Mode()|mask)
 		if err != nil {
 			glog.Errorf("Chmod failed on %v: %v", path, err)
 		}