Merge pull request kubernetes#82873 from odinuge/volume-fd-leak-openstack

k8s-ci-robot · web-flow · commit 338a09abd26a · 2019-09-22T00:53:23.000-07:00
Fix possible fd leak and closing of dirs in doSafeMakeDir
diff --git a/staging/src/k8s.io/legacy-cloud-providers/openstack/util/mount/mount_linux.go b/staging/src/k8s.io/legacy-cloud-providers/openstack/util/mount/mount_linux.go
@@ -1132,7 +1132,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)
 		}

Original file line number	Diff line number	Diff line change
`@@ -1132,7 +1132,7 @@ func doSafeMakeDir(pathname string, base string, perm os.FileMode) error {`
`1132`	`1132`	`return fmt.Errorf("cannot create directory %s: %s", currentPath, err)`
`1133`	`1133`	`}`
`1134`	`1134`	`// Dive into the created directory`
`1135`		`- childFD, err := syscall.Openat(parentFD, dir, nofollowFlags, 0)`
	`1135`	`+ childFD, err = syscall.Openat(parentFD, dir, nofollowFlags, 0)`
`1136`	`1136`	`if err != nil {`
`1137`	`1137`	`return fmt.Errorf("cannot open %s: %s", currentPath, err)`
`1138`	`1138`	`}`