Merge pull request #2822 from thaJeztah/keep_calm

Prevent possible panic in cnmallocator.IsAttachmentAllocated()
moby · Apr 12, 2019 · 5f73a26 · 5f73a26
2 parents 0c00829 + 97c654b
commit 5f73a26
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/manager/allocator/cnmallocator/networkallocator.go b/manager/allocator/cnmallocator/networkallocator.go
@@ -485,7 +485,7 @@ func (na *cnmNetworkAllocator) IsAttachmentAllocated(node *api.Node, networkAtta
 		return false
 	}
 
-	if networkAttachment == nil {
+	if networkAttachment == nil || networkAttachment.Network == nil {
 		return false
 	}