Skip to content

fix(kill): close netns FD to prevent leak and lock OS thread #495

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

Open
AyushSriv06 wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −0
Open

fix(kill): close netns FD to prevent leak and lock OS thread #495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions pkg/unikontainers/unikontainers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,9 @@ func setupUser(user specs.User) error {
// Kill stops the VMM process, first by asking the VMM struct to stop
// and consequently by killing the process described in u.State.Pid
func (u *Unikontainer) Kill() error {
// Lock the OS thread before joining the network namespace to prevent
// the Go runtime from moving this goroutine to a different OS thread.
runtime.LockOSThread()
// Try to join the Network namespace of the monitor before killing it.
// If we kill it there might be no process inside the namespace and hence
// the namespace gets destroyed.
Expand Down Expand Up @@ -681,6 +684,7 @@ func (u Unikontainer) joinSandboxNetNs() error {
if err != nil {
return fmt.Errorf("error opening namespace path: %w", err)
}
defer unix.Close(fd)
err = unix.Setns(int(fd), unix.CLONE_NEWNET)
if err != nil {
return fmt.Errorf("error joining namespace: %w", err)
Expand Down