TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-08 09:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: only call updateFilter with mutex held

Browse Source 
And rename to updateFilterLocked to prevent future mistakes.

Fixes #4427

Change-Id: I4d37b90027d5ff872a339ce8180f5723704848dc
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2022-04-17 14:49:16 -07:00 committed by Brad Fitzpatrick
parent cd916b728b
commit 4ec83fbad6
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ipn/ipnlocal/local.go
View File

@ -119,13 +119,12 @@ type LocalBackend struct {
sshAtomicBool syncs.AtomicBool sshAtomicBool syncs.AtomicBool
sshServer SSHServer // or nil sshServer SSHServer // or nil
filterHash deephash.Sum
filterAtomic atomic.Value // of *filter.Filter filterAtomic atomic.Value // of *filter.Filter
containsViaIPFuncAtomic atomic.Value // of func(netaddr.IP) bool containsViaIPFuncAtomic atomic.Value // of func(netaddr.IP) bool
// The mutex protects the following elements. // The mutex protects the following elements.
mu sync.Mutex mu sync.Mutex
filterHash deephash.Sum
httpTestClient *http.Client // for controlclient. nil by default, used by tests. httpTestClient *http.Client // for controlclient. nil by default, used by tests.
ccGen clientGen // function for producing controlclient; lazily populated ccGen clientGen // function for producing controlclient; lazily populated
notify func(ipn.Notify) notify func(ipn.Notify)
@ -316,7 +315,7 @@ func (b *LocalBackend) linkChange(major bool, ifst *interfaces.State) {
// If the local network configuration has changed, our filter may // If the local network configuration has changed, our filter may
// need updating to tweak default routes. // need updating to tweak default routes.
b.updateFilter(b.netMap, b.prefs) b.updateFilterLocked(b.netMap, b.prefs)
if peerAPIListenAsync && b.netMap != nil && b.state == ipn.Running { if peerAPIListenAsync && b.netMap != nil && b.state == ipn.Running {
want := len(b.netMap.Addresses) want := len(b.netMap.Addresses)
@ -661,7 +660,9 @@ func (b *LocalBackend) setClientStatus(st controlclient.Status) {
if prefsChanged { if prefsChanged {
prefs = b.prefs.Clone() prefs = b.prefs.Clone()
} }
if st.NetMap != nil {
b.updateFilterLocked(st.NetMap, prefs)
}
b.mu.Unlock() b.mu.Unlock()
// Now complete the lock-free parts of what we started while locked. // Now complete the lock-free parts of what we started while locked.
@ -683,7 +684,6 @@ func (b *LocalBackend) setClientStatus(st controlclient.Status) {
} }
} }
b.updateFilter(st.NetMap, prefs)
b.e.SetNetworkMap(st.NetMap) b.e.SetNetworkMap(st.NetMap)
b.e.SetDERPMap(st.NetMap.DERPMap) b.e.SetDERPMap(st.NetMap.DERPMap)
@ -968,10 +968,9 @@ func (b *LocalBackend) Start(opts ipn.Options) error {
b.setNetMapLocked(nil) b.setNetMapLocked(nil)
persistv := b.prefs.Persist persistv := b.prefs.Persist
b.updateFilterLocked(nil, nil)
b.mu.Unlock() b.mu.Unlock()
b.updateFilter(nil, nil)
if b.portpoll != nil { if b.portpoll != nil {
b.portpollOnce.Do(func() { b.portpollOnce.Do(func() {
go b.portpoll.Run(b.ctx) go b.portpoll.Run(b.ctx)
@ -1069,9 +1068,11 @@ func (b *LocalBackend) Start(opts ipn.Options) error {
return nil return nil
} }
// updateFilter updates the packet filter in wgengine based on the // updateFilterLocked updates the packet filter in wgengine based on the
// given netMap and user preferences. // given netMap and user preferences.
func (b *LocalBackend) updateFilter(netMap *netmap.NetworkMap, prefs *ipn.Prefs) { //
// b.mu must be held.
func (b *LocalBackend) updateFilterLocked(netMap *netmap.NetworkMap, prefs *ipn.Prefs) {
// NOTE(danderson): keep change detection as the first thing in // NOTE(danderson): keep change detection as the first thing in
// this function. Don't try to optimize by returning early, more // this function. Don't try to optimize by returning early, more
// likely than not you'll just end up breaking the change // likely than not you'll just end up breaking the change
@ -1825,6 +1826,12 @@ func (b *LocalBackend) setPrefsLockedOnEntry(caller string, newp *ipn.Prefs) {
userID := b.userID userID := b.userID
cc := b.cc cc := b.cc
// [GRINDER STATS LINE] - please don't remove (used for log parsing)
if caller == "SetPrefs" {
b.logf("SetPrefs: %v", newp.Pretty())
}
b.updateFilterLocked(netMap, newp)
b.mu.Unlock() b.mu.Unlock()
if stateKey != "" { if stateKey != "" {
@ -1834,10 +1841,6 @@ func (b *LocalBackend) setPrefsLockedOnEntry(caller string, newp *ipn.Prefs) {
} }
b.writeServerModeStartState(userID, newp) b.writeServerModeStartState(userID, newp)
// [GRINDER STATS LINE] - please don't remove (used for log parsing)
if caller == "SetPrefs" {
b.logf("SetPrefs: %v", newp.Pretty())
}
if netMap != nil { if netMap != nil {
if login := netMap.UserProfiles[netMap.User].LoginName; login != "" { if login := netMap.UserProfiles[netMap.User].LoginName; login != "" {
if newp.Persist == nil { if newp.Persist == nil {
@ -1857,8 +1860,6 @@ func (b *LocalBackend) setPrefsLockedOnEntry(caller string, newp *ipn.Prefs) {
b.doSetHostinfoFilterServices(newHi) b.doSetHostinfoFilterServices(newHi)
} }
b.updateFilter(netMap, newp)
if netMap != nil { if netMap != nil {
b.e.SetDERPMap(netMap.DERPMap) b.e.SetDERPMap(netMap.DERPMap)
} }