mirrors
/
tailscale
mirror of https://github.com/tailscale/tailscale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: don't use BPF receive when SO_MARK doesn't work. 

Fixes #5607

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2022-09-12 14:31:20 -07:00 committed by Dave Anderson
parent c312e0d264
commit 7c49db02a2
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netns/netns_linux.go
View File

@ -65,9 +65,9 @@ func socketMarkWorks() bool {
var forceBindToDevice = envknob.Bool("TS_FORCE_LINUX_BIND_TO_DEVICE") var forceBindToDevice = envknob.Bool("TS_FORCE_LINUX_BIND_TO_DEVICE")
// useSocketMark reports whether SO_MARK works. // UseSocketMark reports whether SO_MARK is in use.
// If it doesn't, we have to use SO_BINDTODEVICE on our sockets instead. // If it doesn't, we have to use SO_BINDTODEVICE on our sockets instead.
func useSocketMark() bool { func UseSocketMark() bool {
if forceBindToDevice { if forceBindToDevice {
return false return false
} }
@ -103,7 +103,7 @@ func controlC(network, address string, c syscall.RawConn) error {
var sockErr error var sockErr error
err := c.Control(func(fd uintptr) { err := c.Control(func(fd uintptr) {
if useSocketMark() { if UseSocketMark() {
sockErr = setBypassMark(fd) sockErr = setBypassMark(fd)
} else { } else {
sockErr = bindToDevice(fd) sockErr = bindToDevice(fd)

6
wgengine/magicsock/magicsock_linux.go
View File

@ -18,6 +18,7 @@ import (
"golang.org/x/net/bpf" "golang.org/x/net/bpf"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"tailscale.com/envknob" "tailscale.com/envknob"
"tailscale.com/net/netns"
"tailscale.com/types/key" "tailscale.com/types/key"
) )
@ -128,6 +129,11 @@ func (c *Conn) listenRawDisco(family string) (io.Closer, error) {
return nil, errors.New("raw disco listening disabled by debug flag") return nil, errors.New("raw disco listening disabled by debug flag")
} }
// https://github.com/tailscale/tailscale/issues/5607
if !netns.UseSocketMark() {
return nil, errors.New("raw disco listening disabled, SO_MARK unavailable")
}
var ( var (
network string network string
addr string addr string