]> Cypherpunks repositories - gostls13.git/commitdiff
net: set CLOEXEC on sockets used for capability probes
authorIan Lance Taylor <iant@golang.org>
Wed, 3 Jan 2018 20:59:09 +0000 (12:59 -0800)
committerIan Lance Taylor <iant@golang.org>
Wed, 3 Jan 2018 22:46:08 +0000 (22:46 +0000)
Fixes #22349

Change-Id: I84ec4fa9fa95bac0f26bf4ca3e62a35dff4f7e00
Reviewed-on: https://go-review.googlesource.com/86015
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/net/ipsock_posix.go

index d659bf063a1675984c7a21e10535e69120494dad..8372aaa7423cf4e59136845f057cbbbe443d83ee 100644 (file)
@@ -24,7 +24,7 @@ import (
 // general. Unfortunately, we need to run on kernels built without
 // IPv6 support too. So probe the kernel to figure it out.
 func (p *ipStackCapabilities) probe() {
-       s, err := socketFunc(syscall.AF_INET, syscall.SOCK_STREAM, syscall.IPPROTO_TCP)
+       s, err := sysSocket(syscall.AF_INET, syscall.SOCK_STREAM, syscall.IPPROTO_TCP)
        switch err {
        case syscall.EAFNOSUPPORT, syscall.EPROTONOSUPPORT:
        case nil:
@@ -48,7 +48,7 @@ func (p *ipStackCapabilities) probe() {
                probes = probes[:1]
        }
        for i := range probes {
-               s, err := socketFunc(syscall.AF_INET6, syscall.SOCK_STREAM, syscall.IPPROTO_TCP)
+               s, err := sysSocket(syscall.AF_INET6, syscall.SOCK_STREAM, syscall.IPPROTO_TCP)
                if err != nil {
                        continue
                }