Merge pull request #25879 from jankaluza/cloexec

openshift-merge-bot[bot] · web-flow · commit 2a9b1499dbae · 2025-04-15T19:52:18.000Z
Fix the fd leaking to aardvark-dns.
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
@@ -440,7 +440,7 @@ func (c *Container) getOCICgroupPath() (string, error) {
 }
 
 func openDirectory(path string) (fd int, err error) {
-	return unix.Open(path, unix.O_RDONLY|unix.O_PATH, 0)
+	return unix.Open(path, unix.O_RDONLY|unix.O_PATH|unix.O_CLOEXEC, 0)
 }
 
 func (c *Container) addNetworkNamespace(g *generate.Generator) error {

Original file line number	Diff line number	Diff line change
`@@ -440,7 +440,7 @@ func (c *Container) getOCICgroupPath() (string, error) {`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`func openDirectory(path string) (fd int, err error) {`
`443`		`- return unix.Open(path, unix.O_RDONLY\|unix.O_PATH, 0)`
	`443`	`+ return unix.Open(path, unix.O_RDONLY\|unix.O_PATH\|unix.O_CLOEXEC, 0)`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`func (c Container) addNetworkNamespace(g generate.Generator) error {`