Merge pull request moby#1778 from WeiZhang555/fix-leaking-netns-file

[bug]Fix race between sandbox.delete() and SetKey()
ggrighi15 · Jun 14, 2017 · 9f6f2c2 · 9f6f2c2
2 parents 0585b10 + 0f17689
commit 9f6f2c2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/libnetwork/sandbox.go b/libnetwork/sandbox.go
@@ -629,6 +629,10 @@ func (sb *sandbox) SetKey(basePath string) error {
 	}
 
 	sb.Lock()
+	if sb.inDelete {
+		sb.Unlock()
+		return types.ForbiddenErrorf("failed to SetKey: sandbox %q delete in progress", sb.id)
+	}
 	oldosSbox := sb.osSbox
 	sb.Unlock()