From 00ca17edf4fb42029b65648f183f8ba4a30a1374 Mon Sep 17 00:00:00 2001
From: Dmytro Shynkevych <dmytro@tailscale.com>
Date: Fri, 19 Jun 2020 13:43:55 -0400
Subject: [PATCH] ipn: fix race in enterState

Signed-Off-By: Dmytro Shynkevych <dmytro@tailscale.com>
---
 ipn/local.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipn/local.go b/ipn/local.go
index fdea6a35a..ad04e4aee 100644
--- a/ipn/local.go
+++ b/ipn/local.go
@@ -920,6 +920,7 @@ func wgCIDRToNetaddr(cidrs []wgcfg.CIDR) (ret []netaddr.IPPrefix) {
 func (b *LocalBackend) enterState(newState State) {
 	b.mu.Lock()
 	state := b.state
+	b.state = newState
 	prefs := b.prefs
 	notify := b.notify
 	b.mu.Unlock()
@@ -933,7 +934,6 @@ func (b *LocalBackend) enterState(newState State) {
 		b.send(Notify{State: &newState})
 	}
 
-	b.state = newState
 	switch newState {
 	case NeedsLogin:
 		b.blockEngineUpdates(true)