From: Sergey Elantsev <elantsev.s@yandex.ru>
Date: Sat, 22 Aug 2020 12:38:34 +0000 (+0300)
Subject: fixed data race in mock vpp adapter
X-Git-Tag: v0.4.0~48
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=govpp.git;a=commitdiff_plain;h=42d11af03300fe0a3476c32ad8c70297862d9320

fixed data race in mock vpp adapter

There was a race in reading VppAdapter.mode in SendMsg and
writing in MockReply/MockReplyHandler/MockReplyWithContext.
All these *Reply* methods hold VppAdapter.repliesLock, so
this fix uses this lock to safely read the value of a mode field.

Signed-off-by: Sergey Elantsev <elantsev.s@yandex.ru>
Change-Id: I6c8873b766df6ea866196a9b96a48ebd08689772
---

diff --git a/adapter/mock/mock_vpp_adapter.go b/adapter/mock/mock_vpp_adapter.go
index b7fa002..f79bb8b 100644
--- a/adapter/mock/mock_vpp_adapter.go
+++ b/adapter/mock/mock_vpp_adapter.go
@@ -252,7 +252,10 @@ func (a *VppAdapter) GetMsgID(msgName string, msgCrc string) (uint16, error) {
 
 // SendMsg emulates sending a binary-encoded message to VPP.
 func (a *VppAdapter) SendMsg(clientID uint32, data []byte) error {
-	switch a.mode {
+	a.repliesLock.Lock()
+	mode := a.mode
+	a.repliesLock.Unlock()
+	switch mode {
 	case useReplyHandlers:
 		for i := len(a.replyHandlers) - 1; i >= 0; i-- {
 			replyHandler := a.replyHandlers[i]