vxlan: check of nil IP in fdb entry

Bug fix where nil IP (byte slice) was dereferenced and caused the goroutine to hang. Fixes kubernetes#260 and kubernetes#267
b3atlesfan · Aug 4, 2015 · 0cde4dc · 0cde4dc
1 parent 63d11a6
commit 0cde4dc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)