p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5947 from glebfm/fix-socket-race-condition

Browse Source 
Fix race condition during socket creation
Upstream-commit: 8ac516094e5b90351cbb436477f06730b1b5e38d
Component: engine
This commit is contained in:
Michael Crosby
2014-05-30 15:07:06 -07:00
parent fc5496269e 24dcd76db5
commit 1f86bb208b
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
components/engine/api/server/server.go
View File

@ -1211,11 +1211,20 @@ func ListenAndServe(proto, addr string, job *engine.Job) error {
}
}
var oldmask int
if proto == "unix" {
oldmask = syscall.Umask(0777)
}
if job.GetenvBool("BufferRequests") {
l, err = listenbuffer.NewListenBuffer(proto, addr, activationLock)
} else {
l, err = net.Listen(proto, addr)
}
if proto == "unix" {
syscall.Umask(oldmask)
}
if err != nil {
return err
}
@ -1253,9 +1262,6 @@ func ListenAndServe(proto, addr string, job *engine.Job) error {
log.Println("/!\\ DON'T BIND ON ANOTHER IP ADDRESS THAN 127.0.0.1 IF YOU DON'T KNOW WHAT YOU'RE DOING /!\\")
}
case "unix":
if err := os.Chmod(addr, 0660); err != nil {
return err
}
socketGroup := job.Getenv("SocketGroup")
if socketGroup != "" {
if err := changeGroup(addr, socketGroup); err != nil {
@ -1267,6 +1273,9 @@ func ListenAndServe(proto, addr string, job *engine.Job) error {
}
}
}
if err := os.Chmod(addr, 0660); err != nil {
return err
}
default:
return fmt.Errorf("Invalid protocol format.")
}