mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-03 20:27:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix race condition in handshake fuzz code

Browse source
This commit is contained in:
Marten Seemann 2020-09-13 23:15:36 +07:00
parent 8bf5c782e3
commit 779c917450
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
fuzzing/handshake/fuzz.go
View file

@ -11,6 +11,7 @@ import (
"log" "log"
"math" "math"
mrand "math/rand" mrand "math/rand"
"sync"
"time" "time"
"github.com/lucas-clemente/quic-go/fuzzing/internal/helper" "github.com/lucas-clemente/quic-go/fuzzing/internal/helper"
@ -159,6 +160,7 @@ type handshakeRunner interface {
} }
type runner struct { type runner struct {
sync.Mutex
errored bool errored bool
client, server *handshake.CryptoSetup client, server *handshake.CryptoSetup
} }
@ -172,6 +174,8 @@ func newRunner(client, server *handshake.CryptoSetup) *runner {
func (r *runner) OnReceivedParams(*wire.TransportParameters) {} func (r *runner) OnReceivedParams(*wire.TransportParameters) {}
func (r *runner) OnHandshakeComplete() {} func (r *runner) OnHandshakeComplete() {}
func (r *runner) OnError(err error) { func (r *runner) OnError(err error) {
r.Lock()
defer r.Unlock()
if r.errored { if r.errored {
return return
} }
@ -179,6 +183,11 @@ func (r *runner) OnError(err error) {
(*r.client).Close() (*r.client).Close()
(*r.server).Close() (*r.server).Close()
} }
func (r *runner) Errored() bool {
r.Lock()
defer r.Unlock()
return r.errored
}
func (r *runner) DropKeys(protocol.EncryptionLevel) {} func (r *runner) DropKeys(protocol.EncryptionLevel) {}
const alpn = "fuzzing" const alpn = "fuzzing"
@ -435,7 +444,7 @@ messageLoop:
case <-done: // test done case <-done: // test done
break messageLoop break messageLoop
} }
if runner.errored { if runner.Errored() {
break messageLoop break messageLoop
} }
} }
@ -443,7 +452,7 @@ messageLoop:
<-done <-done
_ = client.ConnectionState() _ = client.ConnectionState()
_ = server.ConnectionState() _ = server.ConnectionState()
if runner.errored { if runner.Errored() {
return 0 return 0
} }