From 56155d0819f2dcb20502495ad56fd21669ae9839 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Mon, 20 Mar 2017 15:35:20 +0000
Subject: [PATCH] Extra checks on return value from IPAM plugin

---
 plugin/net/cni.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugin/net/cni.go b/plugin/net/cni.go
index 43eda246..0af6e108 100644
--- a/plugin/net/cni.go
+++ b/plugin/net/cni.go
@@ -54,6 +54,9 @@ func (c *CNIPlugin) getIP(ipamType string, args *skel.CmdArgs) (newResult *curre
 	if err != nil {
 		return nil, err
 	}
+	if result == nil {
+		return nil, fmt.Errorf("Received no usable result from IPAM plugin")
+	}
 	newResult, err = current.NewResultFromResult(result)
 	// Check if ipam returned no results without error
 	if err == nil && len(newResult.IPs) == 0 {