Merge pull request #9625 from LK4D4/fix_race_in_sec_opts

Fix race condition between parseSecurityOpt and container.Mount
moby · Dec 12, 2014 · b66abaa · b66abaa
2 parents 4099f09 + 862952c
commit b66abaa
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/daemon/start.go b/daemon/start.go
@@ -44,6 +44,8 @@ func (daemon *Daemon) ContainerStart(job *engine.Job) engine.Status {
 }
 
 func (daemon *Daemon) setHostConfig(container *Container, hostConfig *runconfig.HostConfig) error {
+	container.Lock()
+	defer container.Unlock()
 	if err := parseSecurityOpt(container, hostConfig); err != nil {
 		return err
 	}
@@ -66,8 +68,8 @@ func (daemon *Daemon) setHostConfig(container *Container, hostConfig *runconfig.
 	if err := daemon.RegisterLinks(container, hostConfig); err != nil {
 		return err
 	}
-	container.SetHostConfig(hostConfig)
-	container.ToDisk()
+	container.hostConfig = hostConfig
+	container.toDisk()
 
 	return nil
 }