Merge pull request #79534 from odinuge/volume-util-fd

Fix possible fd leak and closing of dirs in doSafeMakeDir
kubernetes · Jul 1, 2019 · a5e3d74 · a5e3d74
2 parents 64a2be8 + 626a0f7
commit a5e3d74
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/volume/util/subpath/subpath_linux.go b/pkg/volume/util/subpath/subpath_linux.go
@@ -398,7 +398,7 @@ func doSafeMakeDir(pathname string, base string, perm os.FileMode) error {
 			return fmt.Errorf("cannot create directory %s: %s", currentPath, err)
 		}
 		// Dive into the created directory
-		childFD, err := syscall.Openat(parentFD, dir, nofollowFlags, 0)
+		childFD, err = syscall.Openat(parentFD, dir, nofollowFlags, 0)
 		if err != nil {
 			return fmt.Errorf("cannot open %s: %s", currentPath, err)
 		}