From 0cde4dc49f4c653f511868ffe52379c53d5682e1 Mon Sep 17 00:00:00 2001
From: Eugene Yakubovich <eugene.yakubovich@coreos.com>
Date: Mon, 3 Aug 2015 19:07:16 -0700
Subject: [PATCH] vxlan: check of nil IP in fdb entry

Bug fix where nil IP (byte slice) was dereferenced
and caused the goroutine to hang.

Fixes #260 and #267
---
 backend/vxlan/vxlan.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/vxlan/vxlan.go b/backend/vxlan/vxlan.go
index 6672e2b7ea999..f4eecdfaa523f 100644
--- a/backend/vxlan/vxlan.go
+++ b/backend/vxlan/vxlan.go
@@ -308,7 +308,7 @@ func (vb *VXLANBackend) handleInitialSubnetEvents(batch []subnet.Event) error {
 	}
 
 	for j, marker := range fdbEntryMarker {
-		if !marker {
+		if !marker && fdbTable[j].IP != nil {
 			err := vb.dev.DelL2(neigh{IP: ip.FromIP(fdbTable[j].IP), MAC: fdbTable[j].HardwareAddr})
 			if err != nil {
 				log.Error("Delete L2 failed: ", err)