aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2022-11-08 16:16:44 -0500
committerGopher Robot <gobot@golang.org>2022-11-08 22:14:56 +0000
commit896faf306c8ff8b1ae9f5200fa9b7927432b632b (patch)
tree8374584db989f8e8ab9fd91a0fe6db56e9c6cf1a /src
parent8befe0e4083a2a61741f03fb4e4cc2814fe27c35 (diff)
downloadgo-896faf306c8ff8b1ae9f5200fa9b7927432b632b.tar.xz
net: allocate res_state entirely in C memory
The linux-amd64-wsl builder was failing because the res_nsearch implementation was storing pointer to the res_state's own fields in other fields in the res_state. If the res_state is Go memory, this looks like pointers to Go pointers. Moving the res_state to C memory avoids the problem. The linux-amd64-wsl builder has been fixed a different way by replacing res_nsearch with res_search on Linux, where it is thread-safe. But other systems that still need to use res_nsearch (such as macOS) may run into the same kind of problem, so it is probably still worth arranging for the res_state to live entirely in C memory. Fixes #56658 (again). Change-Id: I58a14e72c866eaceb02ad828854a1f626b9b8e73 Reviewed-on: https://go-review.googlesource.com/c/go/+/448798 Run-TryBot: Russ Cox <rsc@golang.org> Auto-Submit: Russ Cox <rsc@golang.org> TryBot-Result: Gopher Robot <gobot@golang.org> Reviewed-by: Ian Lance Taylor <iant@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/net/cgo_unix.go9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/net/cgo_unix.go b/src/net/cgo_unix.go
index 8cf3b87d84..b9759d05a3 100644
--- a/src/net/cgo_unix.go
+++ b/src/net/cgo_unix.go
@@ -331,11 +331,12 @@ func cgoLookupCNAME(ctx context.Context, name string) (cname string, err error,
// resSearch will make a call to the 'res_nsearch' routine in the C library
// and parse the output as a slice of DNS resources.
func resSearch(ctx context.Context, hostname string, rtype, class int) ([]dnsmessage.Resource, error) {
- var state _C_struct___res_state
- if err := _C_res_ninit(&state); err != nil {
+ state := (*_C_struct___res_state)(_C_malloc(unsafe.Sizeof(_C_struct___res_state{})))
+ defer _C_free(unsafe.Pointer(state))
+ if err := _C_res_ninit(state); err != nil {
return nil, errors.New("res_ninit failure: " + err.Error())
}
- defer _C_res_nclose(&state)
+ defer _C_res_nclose(state)
// Some res_nsearch implementations (like macOS) do not set errno.
// They set h_errno, which is not per-thread and useless to us.
@@ -350,7 +351,7 @@ func resSearch(ctx context.Context, hostname string, rtype, class int) ([]dnsmes
defer _C_free(unsafe.Pointer(buf))
s := _C_CString(hostname)
defer _C_FreeCString(s)
- size, err := _C_res_nsearch(&state, s, class, rtype, buf, bufSize)
+ size, err := _C_res_nsearch(state, s, class, rtype, buf, bufSize)
if size <= 0 || size > bufSize {
return nil, errors.New("res_nsearch failure")
}