From c7f0b0152e13c95d53c9ce49a318effa50053239 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 2 Apr 2020 21:21:47 -0700 Subject: [PATCH] Fix NPE due to null value returned by ep.Iface() This PR carryforwards https://github.com/moby/libnetwork/pull/2239 and incorporates the suggestions in comments to fix the NPE and potential NPEs due to a null value returned by ep.Iface() Signed-off-by: Arko Dasgupta --- libnetwork/agent.go | 4 ++-- libnetwork/controller.go | 4 ++++ libnetwork/network.go | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libnetwork/agent.go b/libnetwork/agent.go index fa6ec525b6..4a5c215624 100644 --- a/libnetwork/agent.go +++ b/libnetwork/agent.go @@ -596,7 +596,7 @@ func (ep *endpoint) deleteDriverInfoFromCluster() error { } func (ep *endpoint) addServiceInfoToCluster(sb *sandbox) error { - if ep.isAnonymous() && len(ep.myAliases) == 0 || ep.Iface().Address() == nil { + if ep.isAnonymous() && len(ep.myAliases) == 0 || ep.Iface() == nil || ep.Iface().Address() == nil { return nil } @@ -719,7 +719,7 @@ func (ep *endpoint) deleteServiceInfoFromCluster(sb *sandbox, fullRemove bool, m } } - if ep.Iface().Address() != nil { + if ep.Iface() != nil && ep.Iface().Address() != nil { if ep.svcID != "" { // This is a task part of a service var ingressPorts []*PortConfig diff --git a/libnetwork/controller.go b/libnetwork/controller.go index 5a499aa428..9410058979 100644 --- a/libnetwork/controller.go +++ b/libnetwork/controller.go @@ -979,6 +979,10 @@ func (c *controller) reservePools() { continue } for _, ep := range epl { + if ep.Iface() == nil { + logrus.Warnf("endpoint interface is empty for %q (%s)", ep.Name(), ep.ID()) + continue + } if err := ep.assignAddress(ipam, true, ep.Iface().AddressIPv6() != nil); err != nil { logrus.Warnf("Failed to reserve current address for endpoint %q (%s) on network %q (%s)", ep.Name(), ep.ID(), n.Name(), n.ID()) diff --git a/libnetwork/network.go b/libnetwork/network.go index 778c62a6e6..1f79577395 100644 --- a/libnetwork/network.go +++ b/libnetwork/network.go @@ -1329,7 +1329,7 @@ func (n *network) EndpointByID(id string) (Endpoint, error) { func (n *network) updateSvcRecord(ep *endpoint, localEps []*endpoint, isAdd bool) { var ipv6 net.IP epName := ep.Name() - if iface := ep.Iface(); iface.Address() != nil { + if iface := ep.Iface(); iface != nil && iface.Address() != nil { myAliases := ep.MyAliases() if iface.AddressIPv6() != nil { ipv6 = iface.AddressIPv6().IP