keybase_service_base: fix map delete under a read lock

HOTPOT-2598
turlodales · May 7, 2020 · bb8a527 · bb8a527
1 parent 89219d9
commit bb8a527
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/go/kbfs/libkbfs/keybase_service_base.go b/go/kbfs/libkbfs/keybase_service_base.go
@@ -300,8 +300,10 @@ func (k *KeybaseServiceBase) setCachedTeamInfo(
 
 func (k *KeybaseServiceBase) getCachedNotWriter(
 	tid keybase1.TeamID, uid keybase1.UID) (notWriter bool) {
-	k.teamCacheLock.RLock()
-	defer k.teamCacheLock.RUnlock()
+	// Full write lock because of the delete-after-expiration code
+	// below.
+	k.teamCacheLock.Lock()
+	defer k.teamCacheLock.Unlock()
 	cachedTime, notWriter := k.notWriterCache[tid][uid]
 	if !notWriter {
 		return false