Fix race condition between parseSecurityOpt and container.Mount

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 862952c8d4d3df69f35535af5ce5a079b5fe739e
Component: engine
This commit is contained in:
Alexandr Morozov
2014-12-11 17:22:59 -08:00
parent 62c0414eca
commit d98b25173b
+4 -2
View File
@@ -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
}