forked from cerc-io/plugeth
p2p, p2p/enode: fix data races (#23434)
In p2p/dial.go, conn.flags was accessed without using sync/atomic. This race is fixed by removing the access. In p2p/enode/iter_test.go, a similar race is resolved by writing the field atomically. Co-authored-by: Felix Lange <fjl@twurst.com>
This commit is contained in:
parent
79bb9300c1
commit
8dbf261fd9
@ -107,7 +107,7 @@ type dialScheduler struct {
|
||||
// Everything below here belongs to loop and
|
||||
// should only be accessed by code on the loop goroutine.
|
||||
dialing map[enode.ID]*dialTask // active tasks
|
||||
peers map[enode.ID]connFlag // all connected peers
|
||||
peers map[enode.ID]struct{} // all connected peers
|
||||
dialPeers int // current number of dialed peers
|
||||
|
||||
// The static map tracks all static dial tasks. The subset of usable static dial tasks
|
||||
@ -166,7 +166,7 @@ func newDialScheduler(config dialConfig, it enode.Iterator, setupFunc dialSetupF
|
||||
setupFunc: setupFunc,
|
||||
dialing: make(map[enode.ID]*dialTask),
|
||||
static: make(map[enode.ID]*dialTask),
|
||||
peers: make(map[enode.ID]connFlag),
|
||||
peers: make(map[enode.ID]struct{}),
|
||||
doneCh: make(chan *dialTask),
|
||||
nodesIn: make(chan *enode.Node),
|
||||
addStaticCh: make(chan *enode.Node),
|
||||
@ -259,7 +259,7 @@ loop:
|
||||
d.dialPeers++
|
||||
}
|
||||
id := c.node.ID()
|
||||
d.peers[id] = c.flags
|
||||
d.peers[id] = struct{}{}
|
||||
// Remove from static pool because the node is now connected.
|
||||
task := d.static[id]
|
||||
if task != nil && task.staticPoolIndex >= 0 {
|
||||
|
@ -268,7 +268,7 @@ func (s *genIter) Node() *Node {
|
||||
}
|
||||
|
||||
func (s *genIter) Close() {
|
||||
s.index = ^uint32(0)
|
||||
atomic.StoreUint32(&s.index, ^uint32(0))
|
||||
}
|
||||
|
||||
func testNode(id, seq uint64) *Node {
|
||||
|
Loading…
Reference in New Issue
Block a user