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

k8s-ci-robot · web-flow · commit a5e3d7469149 · 2019-07-01T15:09:58.000-07:00
Fix possible fd leak and closing of dirs in doSafeMakeDir
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)
 		}

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ func doSafeMakeDir(pathname string, base string, perm os.FileMode) error {`
`398`	`398`	`return fmt.Errorf("cannot create directory %s: %s", currentPath, err)`
`399`	`399`	`}`
`400`	`400`	`// Dive into the created directory`
`401`		`- childFD, err := syscall.Openat(parentFD, dir, nofollowFlags, 0)`
	`401`	`+ childFD, err = syscall.Openat(parentFD, dir, nofollowFlags, 0)`
`402`	`402`	`if err != nil {`
`403`	`403`	`return fmt.Errorf("cannot open %s: %s", currentPath, err)`
`404`	`404`	`}`