forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 02:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p/protocols: fix rare data race in Peer.Handshake()

Browse source 
The race occurred in the `!p.Inbound()` case if `send()`
did return an error.

Write #1: in handle closure `rhs = msg` (goroutine)
Write #2: `return nil, error` => `nil` is written to `rhs` (main thread)

fixes ethersphere/go-ethereum#1160
This commit is contained in:
Ferenc Szabo 2019-01-25 15:34:27 +01:00
parent 17723a5294
commit 3d71141693
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
p2p/protocols/protocol.go
View file

@ -386,10 +386,12 @@ func (p *Peer) handleIncoming(handle func(ctx context.Context, msg interface{})
// * the dialing peer needs to send the handshake first and then waits for remote
// * the listening peer waits for the remote handshake and then sends it
// returns the remote handshake and an error
func (p *Peer) Handshake(ctx context.Context, hs interface{}, verify func(interface{}) error) (rhs interface{}, err error) {
func (p *Peer) Handshake(ctx context.Context, hs interface{}, verify func(interface{}) error) (interface{}, error) {
if _, ok := p.spec.GetCode(hs); !ok {
return nil, errorf(ErrHandshake, "unknown handshake message type: %T", hs)
}
var rhs interface{}
errc := make(chan error, 2)
handle := func(ctx context.Context, msg interface{}) error {
rhs = msg
@ -412,6 +414,7 @@ func (p *Peer) Handshake(ctx context.Context, hs interface{}, verify func(interf
}()
for i := 0; i < 2; i++ {
var err error
select {
case err = <-errc:
case <-ctx.Done():