Skip to content

Fix runc kill and runc delete for containers with no init and no private PID namespace #4102

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

Merged
cyphar merged 8 commits into from
Nov 28, 2023
Merged

Fix runc kill and runc delete for containers with no init and no private PID namespace #4102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9f2a24
libct: replace runType with hasInit
kolyshkin Oct 2, 2023
542cce0
libct: Signal: slight refactor
kolyshkin Oct 31, 2023
dcf1b73
runc kill: fix sending KILL to non-pidns container
kolyshkin Oct 31, 2023
29283bb
runc delete -f: fix for no pidns + no init case
kolyshkin Nov 4, 2023
d3d7f7d
libct/cg: improve cgroup removal logic
kolyshkin Nov 9, 2023
7396ca9
runc delete: do not ignore error from destroy
kolyshkin Nov 6, 2023
ab3cd8d
runc delete, container.Destroy: kill all processes
kolyshkin Nov 6, 2023
a6f4081
libct: Destroy: don't proceed in case of errors
kolyshkin Nov 13, 2023
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
31 changes: 14 additions & 17 deletions libcontainer/container_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func (c *Container) ignoreCgroupError(err error) error {
if err == nil {
return nil
}
if errors.Is(err, os.ErrNotExist) && c.runType() == Stopped && !c.cgroupManager.Exists() {
if errors.Is(err, os.ErrNotExist) && !c.hasInit() && !c.cgroupManager.Exists() {
return nil
}
return err
Expand Down Expand Up @@ -1006,34 +1006,31 @@ func (c *Container) refreshState() error {
if paused {
return c.state.transition(&pausedState{c: c})
}
t := c.runType()
switch t {
case Created:
if !c.hasInit() {
return c.state.transition(&stoppedState{c: c})
}
// The presence of exec fifo helps to distinguish between
// the created and the running states.
if _, err := os.Stat(filepath.Join(c.stateDir, execFifoFilename)); err == nil {
return c.state.transition(&createdState{c: c})
case Running:
return c.state.transition(&runningState{c: c})
}
return c.state.transition(&stoppedState{c: c})
return c.state.transition(&runningState{c: c})
}

func (c *Container) runType() Status {
// hasInit tells whether the container init process exists.
func (c *Container) hasInit() bool {
if c.initProcess == nil {
return Stopped
return false
}
pid := c.initProcess.pid()
stat, err := system.Stat(pid)
if err != nil {
return Stopped
return false
}
if stat.StartTime != c.initProcessStartTime || stat.State == system.Zombie || stat.State == system.Dead {
return Stopped
}
// We'll create exec fifo and blocking on it after container is created,
// and delete it after start container.
if _, err := os.Stat(filepath.Join(c.stateDir, execFifoFilename)); err == nil {
return Created
return false
}
return Running
return true
}

func (c *Container) isPaused() (bool, error) {
Expand Down
17 changes: 8 additions & 9 deletions libcontainer/state_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (r *runningState) status() Status {
func (r *runningState) transition(s containerState) error {
switch s.(type) {
case *stoppedState:
if r.c.runType() == Running {
if r.c.hasInit() {
return ErrRunning
}
r.c.state = s
Expand All @@ -118,7 +118,7 @@ func (r *runningState) transition(s containerState) error {
}

func (r *runningState) destroy() error {
if r.c.runType() == Running {
if r.c.hasInit() {
return ErrRunning
}
return destroy(r.c)
Expand Down Expand Up @@ -170,14 +170,13 @@ func (p *pausedState) transition(s containerState) error {
}

func (p *pausedState) destroy() error {
t := p.c.runType()
if t != Running && t != Created {
if err := p.c.cgroupManager.Freeze(configs.Thawed); err != nil {
return err
}
return destroy(p.c)
if p.c.hasInit() {
return ErrPaused
Copy link
Copy Markdown

@ssst0n3 ssst0n3 Sep 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

when t == Created, hasInit() returns false:

  • Before this commit: It returns ErrPaused.
  • After this commit: p.c.cgroupManager.Freeze(configs.Thawed) is executed.

}
if err := p.c.cgroupManager.Freeze(configs.Thawed); err != nil {
return err
}
return ErrPaused
return destroy(p.c)
}

// restoredState is the same as the running state but also has associated checkpoint
Expand Down