go.mod,tun/netstack: bump gvisor

Signed-off-by: James Tucker <james@tailscale.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/go.mod b/go.mod
index 758dcde7300e5fefb0f7f76011c2055b448836b5..919dc49276f1f21f1ae99eebc40b6f88e0091133 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -3,14 +3,14 @@ module golang.zx2c4.com/wireguard
 go 1.20
 
 require (
-       golang.org/x/crypto v0.6.0
-       golang.org/x/net v0.7.0
+       golang.org/x/crypto v0.13.0
+       golang.org/x/net v0.15.0
        golang.org/x/sys v0.12.0
        golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2
-       gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0
+       gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259
 )
 
 require (
        github.com/google/btree v1.0.1 // indirect
-       golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+       golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
 )

diff --git a/go.sum b/go.sum
index fe4ca7e773353a108b56bb5dce08d3f48d73f5f2..6bcecea3ff2fc08d1fea24e2d774a741b416dffc 100644 (file)
--- a/go.sum
+++ b/go.sum
@@ -1,14 +1,14 @@
 github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
 github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
+golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 h1:B82qJJgjvYKsXS9jeunTOisW56dUokqW/FOteYJJ/yg=
 golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI=
-gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0 h1:Wobr37noukisGxpKo5jAsLREcpj61RxrWYzD8uwveOY=
-gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0/go.mod h1:Dn5idtptoW1dIos9U6A2rpebLs/MtTwFacjKb8jLdQA=
+gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259 h1:TbRPT0HtzFP3Cno1zZo7yPzEEnfu8EjLfl6IU9VfqkQ=
+gvisor.dev/gvisor v0.0.0-20230927004350-cbd86285d259/go.mod h1:AVgIgHMwK63XvmAzWG9vLQ41YnVHN0du0tEC46fI7yY=

diff --git a/tun/netstack/tun.go b/tun/netstack/tun.go
index 596cfcd8aaa8eaba449242b7c89aaa82c2fb5d98..2b73054b299aec80cbb064954001810d30ee2e3c 100644 (file)
--- a/tun/netstack/tun.go
+++ b/tun/netstack/tun.go
@@ -25,7 +25,7 @@ import (
        "golang.zx2c4.com/wireguard/tun"
 
        "golang.org/x/net/dns/dnsmessage"
-       "gvisor.dev/gvisor/pkg/bufferv2"
+       "gvisor.dev/gvisor/pkg/buffer"
        "gvisor.dev/gvisor/pkg/tcpip"
        "gvisor.dev/gvisor/pkg/tcpip/adapters/gonet"
        "gvisor.dev/gvisor/pkg/tcpip/header"
@@ -43,7 +43,7 @@ type netTun struct {
        ep             *channel.Endpoint
        stack          *stack.Stack
        events         chan tun.Event
-       incomingPacket chan *bufferv2.View
+       incomingPacket chan *buffer.View
        mtu            int
        dnsServers     []netip.Addr
        hasV4, hasV6   bool
@@ -61,7 +61,7 @@ func CreateNetTUN(localAddresses, dnsServers []netip.Addr, mtu int) (tun.Device,
                ep:             channel.New(1024, uint32(mtu), ""),
                stack:          stack.New(opts),
                events:         make(chan tun.Event, 10),
-               incomingPacket: make(chan *bufferv2.View),
+               incomingPacket: make(chan *buffer.View),
                dnsServers:     dnsServers,
                mtu:            mtu,
        }
@@ -84,7 +84,7 @@ func CreateNetTUN(localAddresses, dnsServers []netip.Addr, mtu int) (tun.Device,
                }
                protoAddr := tcpip.ProtocolAddress{
                        Protocol:          protoNumber,
-                       AddressWithPrefix: tcpip.Address(ip.AsSlice()).WithPrefix(),
+                       AddressWithPrefix: tcpip.AddrFromSlice(ip.AsSlice()).WithPrefix(),
                }
                tcpipErr := dev.stack.AddProtocolAddress(1, protoAddr, stack.AddressProperties{})
                if tcpipErr != nil {
@@ -140,7 +140,7 @@ func (tun *netTun) Write(buf [][]byte, offset int) (int, error) {
                        continue
                }
 
-               pkb := stack.NewPacketBuffer(stack.PacketBufferOptions{Payload: bufferv2.MakeWithData(packet)})
+               pkb := stack.NewPacketBuffer(stack.PacketBufferOptions{Payload: buffer.MakeWithData(packet)})
                switch packet[0] >> 4 {
                case 4:
                        tun.ep.InjectInbound(header.IPv4ProtocolNumber, pkb)
@@ -198,7 +198,7 @@ func convertToFullAddr(endpoint netip.AddrPort) (tcpip.FullAddress, tcpip.Networ
        }
        return tcpip.FullAddress{
                NIC:  1,
-               Addr: tcpip.Address(endpoint.Addr().AsSlice()),
+               Addr: tcpip.AddrFromSlice(endpoint.Addr().AsSlice()),
                Port: endpoint.Port(),
        }, protoNumber
 }
@@ -453,7 +453,7 @@ func (pc *PingConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
                return 0, nil, fmt.Errorf("ping read: %s", tcpipErr)
        }
 
-       remoteAddr, _ := netip.AddrFromSlice([]byte(res.RemoteAddr.Addr))
+       remoteAddr, _ := netip.AddrFromSlice(res.RemoteAddr.Addr.AsSlice())
        return res.Count, &PingAddr{remoteAddr}, nil
 }
 

diff --git a/tun/tcp_offload_linux_test.go b/tun/tcp_offload_linux_test.go
index 9160e18cdd941ef0ed88b47863d8e6ef92c5a88c..ddddc486854ba40be06d7ad8909260bfcad15016 100644 (file)
--- a/tun/tcp_offload_linux_test.go
+++ b/tun/tcp_offload_linux_test.go
@@ -35,8 +35,8 @@ func tcp4PacketMutateIPFields(srcIPPort, dstIPPort netip.AddrPort, flags header.
        srcAs4 := srcIPPort.Addr().As4()
        dstAs4 := dstIPPort.Addr().As4()
        ipFields := &header.IPv4Fields{
-               SrcAddr:     tcpip.Address(srcAs4[:]),
-               DstAddr:     tcpip.Address(dstAs4[:]),
+               SrcAddr:     tcpip.AddrFromSlice(srcAs4[:]),
+               DstAddr:     tcpip.AddrFromSlice(dstAs4[:]),
                Protocol:    unix.IPPROTO_TCP,
                TTL:         64,
                TotalLength: uint16(totalLen),
@@ -72,8 +72,8 @@ func tcp6PacketMutateIPFields(srcIPPort, dstIPPort netip.AddrPort, flags header.
        srcAs16 := srcIPPort.Addr().As16()
        dstAs16 := dstIPPort.Addr().As16()
        ipFields := &header.IPv6Fields{
-               SrcAddr:           tcpip.Address(srcAs16[:]),
-               DstAddr:           tcpip.Address(dstAs16[:]),
+               SrcAddr:           tcpip.AddrFromSlice(srcAs16[:]),
+               DstAddr:           tcpip.AddrFromSlice(dstAs16[:]),
                TransportProtocol: unix.IPPROTO_TCP,
                HopLimit:          64,
                PayloadLength:     uint16(segmentSize + 20),