Merge pull request bottlerocket-os#595 from KCSesh/apiserver-fd-bug

KCSesh · web-flow · commit 558f8e52efd4 · 2025-07-23T14:02:26.000-07:00
apiserver: fix file descriptor leak in exec
diff --git a/sources/api/apiserver/src/server/exec/child.rs b/sources/api/apiserver/src/server/exec/child.rs
@@ -241,6 +241,13 @@ impl ChildHandles {
     }
 }
 
+impl Drop for ChildHandles {
+    /// Ensures the RawFd is properly closed when ChildHandles is dropped.
+    fn drop(&mut self) {
+        let _ = close(self.pty_fd);
+    }
+}
+
 /// ChildFds sets up read and write file descriptors for a Command (before it's spawned) based on
 /// whether the user requested a TTY.
 struct ChildFds {

Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,13 @@ impl ChildHandles {`
`241`	`241`	`}`
`242`	`242`	`}`
`243`	`243`
	`244`	`+impl Drop for ChildHandles {`
	`245`	`+ /// Ensures the RawFd is properly closed when ChildHandles is dropped.`
	`246`	`+ fn drop(&mut self) {`
	`247`	`+ let _ = close(self.pty_fd);`
	`248`	`+ }`
	`249`	`+}`
	`250`	`+`
`244`	`251`	`/// ChildFds sets up read and write file descriptors for a Command (before it's spawned) based on`
`245`	`252`	`/// whether the user requested a TTY.`
`246`	`253`	`struct ChildFds {`