Skip to content

util_linux: add connection close in setupIO #4780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
+6 −1
Closed

util_linux: add connection close in setupIO #4780

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
edeb793
util_linux: add connection close in setupIO
Jun 9, 2025
2b3f876
util_linux: add connection close in setupIO
Jul 4, 2025
5d12fc3
util_linux: add connection close in setupIO
Jul 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion utils_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func newProcess(p *specs.Process) (*libcontainer.Process, error) {
}

// setupIO modifies the given process config according to the options.
func setupIO(process *libcontainer.Process, container *libcontainer.Container, createTTY, detach bool, sockpath string) (*tty, error) {
func setupIO(process *libcontainer.Process, container *libcontainer.Container, createTTY, detach bool, sockpath string) (_ *tty, Err error) {
if createTTY {
process.Stdin = nil
process.Stdout = nil
Expand All @@ -121,6 +121,11 @@ func setupIO(process *libcontainer.Process, container *libcontainer.Container, c
if err != nil {
return nil, err
}
defer func() {
if Err != nil {
conn.Close()
}
}()
Comment on lines +124 to +128
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The uc.File() call below is also missing a close.

Not sure when we can close it, though. Maybe it's handled by the caller, can you check?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have not found any pure check of this. If you succeeded, please show me where it happens.

uc, ok := conn.(*net.UnixConn)
if !ok {
return nil, errors.New("casting to UnixConn failed")
Expand Down