Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 1 addition & 11 deletions internal/guest/runtime/hcsv2/uvm.go
Original file line number Diff line number Diff line change
Expand Up @@ -683,17 +683,7 @@ func (h *Host) SignalContainerProcess(ctx context.Context, containerID string, p
return err
}

signalingInitProcess := (processID == c.initProcess.pid)

// Don't allow signalProcessV2 to route around container shutdown policy
// Sending SIGTERM or SIGKILL to a containers init process will shut down
// the container.
if signalingInitProcess {
if (signal == unix.SIGTERM) || (signal == unix.SIGKILL) {
graceful := (signal == unix.SIGTERM)
return h.ShutdownContainer(ctx, containerID, graceful)
}
}
signalingInitProcess := processID == c.initProcess.pid

startupArgList := p.(*containerProcess).spec.Args
err = h.securityPolicyEnforcer.EnforceSignalContainerProcessPolicy(ctx, containerID, signal, signalingInitProcess, startupArgList)
Expand Down
3 changes: 0 additions & 3 deletions internal/guest/runtime/runc/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ func (c *container) ExecProcess(process *oci.Process, stdioSet *stdio.Connection
func (c *container) Kill(signal syscall.Signal) error {
logrus.WithField(logfields.ContainerID, c.id).Debug("runc::container::Kill")
args := []string{"kill"}
if signal == syscall.SIGTERM || signal == syscall.SIGKILL {
args = append(args, "--all")
}
args = append(args, c.id, strconv.Itoa(int(signal)))
cmd := runcCommand(args...)
out, err := cmd.CombinedOutput()
Expand Down