aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2021-10-28 13:47:50 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2021-10-28 13:47:50 +0200
commiteb6302c7eb71e3e3df9f63395bc5c97dcf0efc84 (patch)
tree3667d43a21b79765f0e3e66a89ba156912021106
parentdevice: timers: seed unsafe rng before use for jitter (diff)
downloadwireguard-go-eb6302c7eb71e3e3df9f63395bc5c97dcf0efc84.tar.xz
wireguard-go-eb6302c7eb71e3e3df9f63395bc5c97dcf0efc84.zip
device: timers: use pre-seeded per-thread unlocked fastrandn for jitter
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--device/timers.go15
1 files changed, 5 insertions, 10 deletions
diff --git a/device/timers.go b/device/timers.go
index aa6f28a..176976d 100644
--- a/device/timers.go
+++ b/device/timers.go
@@ -8,19 +8,14 @@
package device
import (
- "crypto/rand"
- unsafeRand "math/rand"
"sync"
"sync/atomic"
"time"
- "unsafe"
+ _ "unsafe"
)
-func init() {
- var seed int64
- rand.Read(unsafe.Slice((*byte)(unsafe.Pointer(&seed)), unsafe.Sizeof(seed)))
- unsafeRand.Seed(seed)
-}
+//go:linkname fastrandn runtime.fastrandn
+func fastrandn(n uint32) uint32
// A Timer manages time-based aspects of the WireGuard protocol.
// Timer roughly copies the interface of the Linux kernel's struct timer_list.
@@ -152,7 +147,7 @@ func expiredPersistentKeepalive(peer *Peer) {
/* Should be called after an authenticated data packet is sent. */
func (peer *Peer) timersDataSent() {
if peer.timersActive() && !peer.timers.newHandshake.IsPending() {
- peer.timers.newHandshake.Mod(KeepaliveTimeout + RekeyTimeout + time.Millisecond*time.Duration(unsafeRand.Int63n(RekeyTimeoutJitterMaxMs)))
+ peer.timers.newHandshake.Mod(KeepaliveTimeout + RekeyTimeout + time.Millisecond*time.Duration(fastrandn(RekeyTimeoutJitterMaxMs)))
}
}
@@ -184,7 +179,7 @@ func (peer *Peer) timersAnyAuthenticatedPacketReceived() {
/* Should be called after a handshake initiation message is sent. */
func (peer *Peer) timersHandshakeInitiated() {
if peer.timersActive() {
- peer.timers.retransmitHandshake.Mod(RekeyTimeout + time.Millisecond*time.Duration(unsafeRand.Int63n(RekeyTimeoutJitterMaxMs)))
+ peer.timers.retransmitHandshake.Mod(RekeyTimeout + time.Millisecond*time.Duration(fastrandn(RekeyTimeoutJitterMaxMs)))
}
}