Merge pull request #210 from cpuguy83/open_cloexec

crosbymichael · web-flow · commit 2b95ef06cde6 · 2021-11-20T11:27:28.000-05:00
Fix potential dirfd leak.
diff --git a/v2/manager.go b/v2/manager.go
@@ -658,7 +658,7 @@ func setDevices(path string, devices []specs.LinuxDeviceCgroup) error {
 	if err != nil {
 		return err
 	}
-	dirFD, err := unix.Open(path, unix.O_DIRECTORY|unix.O_RDONLY, 0600)
+	dirFD, err := unix.Open(path, unix.O_DIRECTORY|unix.O_RDONLY|unix.O_CLOEXEC, 0600)
 	if err != nil {
 		return fmt.Errorf("cannot get dir FD for %s", path)
 	}

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ func setDevices(path string, devices []specs.LinuxDeviceCgroup) error {`
`658`	`658`	`if err != nil {`
`659`	`659`	`return err`
`660`	`660`	`}`
`661`		`- dirFD, err := unix.Open(path, unix.O_DIRECTORY\|unix.O_RDONLY, 0600)`
	`661`	`+ dirFD, err := unix.Open(path, unix.O_DIRECTORY\|unix.O_RDONLY\|unix.O_CLOEXEC, 0600)`
`662`	`662`	`if err != nil {`
`663`	`663`	`return fmt.Errorf("cannot get dir FD for %s", path)`
`664`	`664`	`}`