qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 07:20:06 -07:00
Code Releases Activity

syscall: use SOCK_CLOEXEC when creating sockets

Browse Source 
LsfSocket, SetLsfPromisc and NetlinkRIB currently don't force the CLOEXEC
flag on the sockets they create. While the former two functions are
deprecated, NetlinkRIB is called by various functions related to
net.Interface.

Add a helper to create CLOEXEC sockets, and use it from SetLsfPromisc and
NetlinkRIB. LsfSocket is unchanged since we don't want to break callers.

Fixes #36053

Change-Id: I72fe2b167996797698d8a44b0d28165045c42d3c
Reviewed-on: https://go-review.googlesource.com/c/go/+/210517
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Lorenz Bauer 2019-12-10 15:58:24 +00:00 committed by Ian Lance Taylor
parent 84540f0b0a
commit 9c8c27a318
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/syscall/lsf_linux.go
View File

@ -23,6 +23,8 @@ func LsfJump(code, k, jt, jf int) *SockFilter {
// Deprecated: Use golang.org/x/net/bpf instead.
func LsfSocket(ifindex, proto int) (int, error) {
var lsall SockaddrLinklayer
// This is missing SOCK_CLOEXEC, but adding the flag
// could break callers.
s, e := Socket(AF_PACKET, SOCK_RAW, proto)
if e != nil {
return 0, e
@ -46,7 +48,7 @@ type iflags struct {
// Deprecated: Use golang.org/x/net/bpf instead.
func SetLsfPromisc(name string, m bool) error {
s, e := Socket(AF_INET, SOCK_DGRAM, 0)
s, e := cloexecSocket(AF_INET, SOCK_DGRAM, 0)
if e != nil {
return e
}

2
src/syscall/netlink_linux.go
View File

@ -50,7 +50,7 @@ func newNetlinkRouteRequest(proto, seq, family int) []byte {
// NetlinkRIB returns routing information base, as known as RIB, which
// consists of network facility information, states and parameters.
func NetlinkRIB(proto, family int) ([]byte, error) {
s, err := Socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)
s, err := cloexecSocket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE)
if err != nil {
return nil, err
}

29
src/syscall/sock_cloexec_linux.go Normal file
View File

@ -0,0 +1,29 @@
// Copyright 2019 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package syscall
// This is a stripped down version of sysSocket from net/sock_cloexec.go.
func cloexecSocket(family, sotype, proto int) (int, error) {
s, err := Socket(family, sotype|SOCK_CLOEXEC, proto)
switch err {
case nil:
return s, nil
default:
return -1, err
case EINVAL:
}
ForkLock.RLock()
s, err = Socket(family, sotype, proto)
if err == nil {
CloseOnExec(s)
}
ForkLock.RUnlock()
if err != nil {
Close(s)
return -1, err
}
return s, nil
}