From a5839004b654ca79f955a7348515d5c891fc4881 Mon Sep 17 00:00:00 2001
From: Stan Lagun <slagun@mirantis.com>
Date: Sun, 1 Oct 2017 21:57:12 -0700
Subject: [PATCH] Protect TapFDSource.fdMap from concurrent access

---
 pkg/tapmanager/tapfdsource.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkg/tapmanager/tapfdsource.go b/pkg/tapmanager/tapfdsource.go
index a09b3232d..d3563b165 100644
--- a/pkg/tapmanager/tapfdsource.go
+++ b/pkg/tapmanager/tapfdsource.go
@@ -19,6 +19,7 @@ package tapmanager
 import (
 	"encoding/json"
 	"fmt"
+	"sync"
 	"time"
 
 	"github.com/containernetworking/cni/pkg/ns"
@@ -67,6 +68,8 @@ type podNetwork struct {
 // TapFDSource sets up and tears down Virtlet VM network.
 // It implements FDSource interface
 type TapFDSource struct {
+	sync.Mutex
+
 	cniClient *cni.Client
 	fdMap     map[string]*podNetwork
 }
@@ -178,6 +181,8 @@ func (s *TapFDSource) GetFD(key string, data []byte) (int, []byte, error) {
 		return 0, nil, fmt.Errorf("error marshalling net config: %v", err)
 	}
 
+	s.Lock()
+	defer s.Unlock()
 	s.fdMap[key] = &podNetwork{
 		pnd:        *pnd,
 		csn:        csn,
@@ -189,6 +194,8 @@ func (s *TapFDSource) GetFD(key string, data []byte) (int, []byte, error) {
 
 // Release implements Release method of FDSource interface
 func (s *TapFDSource) Release(key string) error {
+	s.Lock()
+	defer s.Unlock()
 	pn, found := s.fdMap[key]
 	if !found {
 		return fmt.Errorf("bad fd key: %q", key)
@@ -228,6 +235,8 @@ func (s *TapFDSource) Release(key string) error {
 
 // GetInfo implements GetInfo method of FDSource interface
 func (s *TapFDSource) GetInfo(key string) ([]byte, error) {
+	s.Lock()
+	defer s.Unlock()
 	pn, found := s.fdMap[key]
 	if !found {
 		return nil, fmt.Errorf("bad fd key: %q", key)