Merge pull request #3035 from lifenjoiner/race

jedisct1 · web-flow · commit f89994558a1b · 2025-11-14T12:11:51.000+01:00
Fix potential slice corruption for ODoH
diff --git a/dnscrypt-proxy/serversInfo.go b/dnscrypt-proxy/serversInfo.go
@@ -661,7 +661,8 @@ func route(proxy *Proxy, name string, serverProto stamps.StampProtoType) (*Relay
 			return nil, err
 		}
 		var relayURLforTarget *url.URL
-		for _, server := range proxy.registeredServers {
+		proxy.serversInfo.RLock()
+		for _, server := range proxy.serversInfo.registeredServers {
 			if server.name != name || server.stamp.Proto != stamps.StampProtoTypeODoHTarget {
 				continue
 			}
@@ -673,6 +674,7 @@ func route(proxy *Proxy, name string, serverProto stamps.StampProtoType) (*Relay
 			relayURLforTarget = &tmp
 			break
 		}
+		proxy.serversInfo.RUnlock()
 		if relayURLforTarget == nil {
 			return nil, fmt.Errorf("Relay [%v] not found", relayName)
 		}

Original file line number	Diff line number	Diff line change
`@@ -661,7 +661,8 @@ func route(proxy Proxy, name string, serverProto stamps.StampProtoType) (Relay`
`661`	`661`	`return nil, err`
`662`	`662`	`}`
`663`	`663`	`var relayURLforTarget *url.URL`
`664`		`- for _, server := range proxy.registeredServers {`
	`664`	`+ proxy.serversInfo.RLock()`
	`665`	`+ for _, server := range proxy.serversInfo.registeredServers {`
`665`	`666`	`if server.name != name \|\| server.stamp.Proto != stamps.StampProtoTypeODoHTarget {`
`666`	`667`	`continue`
`667`	`668`	`}`
`@@ -673,6 +674,7 @@ func route(proxy Proxy, name string, serverProto stamps.StampProtoType) (Relay`
`673`	`674`	`relayURLforTarget = &tmp`
`674`	`675`	`break`
`675`	`676`	`}`
	`677`	`+ proxy.serversInfo.RUnlock()`
`676`	`678`	`if relayURLforTarget == nil {`
`677`	`679`	`return nil, fmt.Errorf("Relay [%v] not found", relayName)`
`678`	`680`	`}`