From ca7219f5daa194ae714c3a3396703e08d8a137c8 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Mon, 11 May 2015 13:23:50 -0700 Subject: [PATCH] Fix race between execdriver.Kill and execdriver.Run Signed-off-by: Alexander Morozov --- daemon/execdriver/native/driver.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/daemon/execdriver/native/driver.go b/daemon/execdriver/native/driver.go index fdd2a1137c..1e1df1f21b 100644 --- a/daemon/execdriver/native/driver.go +++ b/daemon/execdriver/native/driver.go @@ -245,7 +245,9 @@ func waitInPIDHost(p *libcontainer.Process, c libcontainer.Container) func() (*o } func (d *driver) Kill(c *execdriver.Command, sig int) error { + d.Lock() active := d.activeContainers[c.ID] + d.Unlock() if active == nil { return fmt.Errorf("active container for %s does not exist", c.ID) }