opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16323 from mheon/lock_during_kill

Browse Source 
Ensure that StartAndAttach locks while sending signals
This commit is contained in:
OpenShift Merge Robot
2022-10-28 02:45:21 -04:00
committed by GitHub
parent 25b5ee66b1 871172e6fe
commit d444c2c001
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_api.go
View File

@ -282,6 +282,8 @@ func (c *Container) Attach(streams *define.AttachStreams, keys string, resize <-
if c.Terminal() { if c.Terminal() {
go func() { go func() {
<-attachRdy <-attachRdy
c.lock.Lock()
defer c.lock.Unlock()
if err := c.ociRuntime.KillContainer(c, uint(signal.SIGWINCH), false); err != nil { if err := c.ociRuntime.KillContainer(c, uint(signal.SIGWINCH), false); err != nil {
logrus.Warnf("Unable to send SIGWINCH to container %s after attach: %v", c.ID(), err) logrus.Warnf("Unable to send SIGWINCH to container %s after attach: %v", c.ID(), err)
} }