From e0098fdbb0ea1c476a716959adb882bc37450426 Mon Sep 17 00:00:00 2001 From: Antonio Murdaca Date: Tue, 26 May 2015 13:54:53 +0200 Subject: [PATCH] Add lock before accessing native driver active containers Signed-off-by: Antonio Murdaca Upstream-commit: 9e425d56d0ec7d3343dd309500a7fe6e36648f2b Component: engine --- components/engine/daemon/execdriver/native/driver.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/engine/daemon/execdriver/native/driver.go b/components/engine/daemon/execdriver/native/driver.go index 67b6987166..4da3e34382 100644 --- a/components/engine/daemon/execdriver/native/driver.go +++ b/components/engine/daemon/execdriver/native/driver.go @@ -259,7 +259,9 @@ func (d *driver) Kill(c *execdriver.Command, sig int) error { } func (d *driver) Pause(c *execdriver.Command) 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) } @@ -267,7 +269,9 @@ func (d *driver) Pause(c *execdriver.Command) error { } func (d *driver) Unpause(c *execdriver.Command) 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) }