docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9625 from LK4D4/fix_race_in_sec_opts 

Fix race condition between parseSecurityOpt and container.Mount
This commit is contained in:
Jessie Frazelle 2014-12-12 11:34:59 -08:00
parent 4099f098bd 862952c8d4
commit b66abaa291
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/start.go
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 { func (daemon *Daemon) setHostConfig(container *Container, hostConfig *runconfig.HostConfig) error {
container.Lock()
defer container.Unlock()
if err := parseSecurityOpt(container, hostConfig); err != nil { if err := parseSecurityOpt(container, hostConfig); err != nil {
return err return err
} }
@ -66,8 +68,8 @@ func (daemon *Daemon) setHostConfig(container *Container, hostConfig *runconfig.
if err := daemon.RegisterLinks(container, hostConfig); err != nil { if err := daemon.RegisterLinks(container, hostConfig); err != nil {
return err return err
} }
container.SetHostConfig(hostConfig) container.hostConfig = hostConfig
container.ToDisk() container.toDisk()
return nil return nil
} }