SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-03 20:07:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix buffer usage

Browse source
This commit is contained in:
世界 2022-05-07 17:08:57 +08:00
parent 6089c358c2
commit f1b87be6e4
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
21 changed files with 121 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cli/libpack/main_linux.go
View file

@ -4,9 +4,6 @@ import (
"archive/tar"
_ "embed"
"encoding/hex"
"github.com/sagernet/sing"
"github.com/sagernet/sing/common/log"
"github.com/spf13/cobra"
"io"
"os"
"os/exec"
@ -15,17 +12,22 @@ import (
"strings"
"github.com/klauspost/compress/zstd"
"github.com/sagernet/sing"
"github.com/sagernet/sing/common"
E "github.com/sagernet/sing/common/exceptions"
"github.com/sagernet/sing/common/log"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/u-root/u-root/pkg/ldd"
)
var logger = log.NewLogger("libpack")
var packageName string
var executablePath string
var outputPath string
var (
packageName string
executablePath string
outputPath string
)
func main() {
command := &cobra.Command{

2
cli/socks-chk/main.go
View file

@ -6,6 +6,7 @@ import (
"io"
"net"
"net/netip"
"runtime"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -129,6 +130,7 @@ func testSocksUDP(server M.Socksaddr) error {
Port: 53,
}))
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
common.Must2(buffer.ReadPacketFrom(assConn))
common.Must(message.Unpack(buffer.Bytes()))

3
cli/ss-local/main.go
View file

@ -10,6 +10,7 @@ import (
"net/netip"
"os"
"os/signal"
"runtime"
"runtime/debug"
"strings"
"syscall"
@ -350,7 +351,7 @@ func (c *client) NewConnection(ctx context.Context, conn net.Conn, metadata M.Me
if err != nil {
return E.Cause(err, "client handshake")
}
runtime.KeepAlive(_payload)
return rw.CopyConn(ctx, serverConn, conn)
}

3
cli/trojan-local/main.go
View file

@ -9,6 +9,7 @@ import (
"net/netip"
"os"
"os/signal"
"runtime"
"syscall"
"time"
@ -315,7 +316,7 @@ func (c *client) NewConnection(ctx context.Context, conn net.Conn, metadata M.Me
if err != nil {
return E.Cause(err, "client handshake")
}
runtime.KeepAlive(_request)
return rw.CopyConn(ctx, clientConn, conn)
}

4
common/buf/buffer.go
View file

@ -119,7 +119,7 @@ func (b *Buffer) ExtendHeader(size int) []byte {
}
}
func (b *Buffer) WriteBufferAtFirst(buffer *Buffer) *Buffer {
func (b *Buffer) _WriteBufferAtFirst(buffer *Buffer) *Buffer {
size := buffer.Len()
if b.start >= size {
n := copy(b.data[b.start-size:b.start], buffer.Bytes())
@ -140,7 +140,7 @@ func (b *Buffer) WriteBufferAtFirst(buffer *Buffer) *Buffer {
}
}
func (b *Buffer) WriteAtFirst(data []byte) (n int, err error) {
func (b *Buffer) _WriteAtFirst(data []byte) (n int, err error) {
size := len(data)
if b.start >= size {
n = copy(b.data[b.start-size:b.start], data)

3
common/network/conn.go
View file

@ -4,6 +4,7 @@ import (
"context"
"net"
"os"
"runtime"
"time"
"github.com/sagernet/sing/common"
@ -63,6 +64,7 @@ func CopyPacketConn(ctx context.Context, dest PacketConn, conn PacketConn) error
defer rw.CloseRead(conn)
defer rw.CloseWrite(dest)
_buffer := buf.StackNewMax()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
data := buffer.Cut(buf.ReversedHeader, buf.ReversedHeader)
for {
@ -81,6 +83,7 @@ func CopyPacketConn(ctx context.Context, dest PacketConn, conn PacketConn) error
defer rw.CloseRead(dest)
defer rw.CloseWrite(conn)
_buffer := buf.StackNewMax()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
data := buffer.Cut(buf.ReversedHeader, buf.ReversedHeader)
for {

4
common/rw/copy.go
View file

@ -5,6 +5,7 @@ import (
"io"
"net"
"os"
"runtime"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -69,6 +70,7 @@ func Copy(dst io.Writer, src io.Reader) (n int64, err error) {
return rt.ReadFrom(src)
}
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
for {
buffer.FullReset()
@ -89,6 +91,7 @@ func Copy(dst io.Writer, src io.Reader) (n int64, err error) {
func CopyPacketConn(ctx context.Context, conn net.PacketConn, outPacketConn net.PacketConn) error {
return task.Run(ctx, func() error {
_buffer := buf.With(make([]byte, buf.UDPBufferSize))
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
for {
n, addr, err := conn.ReadFrom(buffer.FreeBytes())
@ -104,6 +107,7 @@ func CopyPacketConn(ctx context.Context, conn net.PacketConn, outPacketConn net.
}
}, func() error {
_buffer := buf.With(make([]byte, buf.UDPBufferSize))
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
for {
n, addr, err := outPacketConn.ReadFrom(buffer.FreeBytes())

2
common/rw/read.go
View file

@ -2,6 +2,7 @@ package rw
import (
"io"
"runtime"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -63,6 +64,7 @@ func ReadFrom0(readerFrom ReaderFromWriter, reader io.Reader) (n int64, err erro
func CopyOnce(dest io.Writer, src io.Reader) (n int64, err error) {
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
n, err = buffer.ReadFrom(src)
if err != nil {

2
common/tun/system/tun.go
View file

@ -5,6 +5,7 @@ import (
"net"
"net/netip"
"os"
"runtime"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -88,6 +89,7 @@ func (t *Stack) Close() error {
func (t *Stack) tunLoop() {
_buffer := buf.Make(t.tunMtu)
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
for {
n, err := t.tunFile.Read(buffer)

3
common/uot/server.go
View file

@ -4,6 +4,7 @@ import (
"encoding/binary"
"io"
"net"
"runtime"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -41,6 +42,7 @@ func (c *ServerConn) RemoteAddr() net.Addr {
func (c *ServerConn) loopInput() {
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
for {
destination, err := AddrParser.ReadAddrPort(c.inputReader)
@ -74,6 +76,7 @@ func (c *ServerConn) loopInput() {
func (c *ServerConn) loopOutput() {
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
for {
buffer.FullReset()

2
common/uot/uot_test.go
View file

@ -2,6 +2,7 @@ package uot
import (
"net"
"runtime"
"testing"
"github.com/sagernet/sing/common"
@ -30,6 +31,7 @@ func TestServerConn(t *testing.T) {
Port: 53,
}))
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
common.Must2(buffer.ReadPacketFrom(clientConn))
common.Must(message.Unpack(buffer.Bytes()))

28
protocol/shadowsocks/none.go
View file

@ -5,6 +5,7 @@ import (
"io"
"net"
"net/netip"
"runtime"
"sync"
"github.com/sagernet/sing/common"
@ -95,6 +96,7 @@ func (c *noneConn) Write(b []byte) (n int, err error) {
bufN, _ := buffer.Write(b)
_, err = c.Conn.Write(buffer.Bytes())
runtime.KeepAlive(_buffer)
if err != nil {
return
}
@ -141,17 +143,27 @@ func (c *nonePacketConn) ReadPacket(buffer *buf.Buffer) (M.Socksaddr, error) {
return socks5.AddressSerializer.ReadAddrPort(buffer)
}
func (c *nonePacketConn) WritePacket(buffer *buf.Buffer, addrPort M.Socksaddr) error {
defer buffer.Release()
_header := buf.StackNewMax()
header := common.Dup(_header)
err := socks5.AddressSerializer.WriteAddrPort(header, addrPort)
func (c *nonePacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
headerLen := socks5.AddressSerializer.AddrPortLen(destination)
var header *buf.Buffer
var writeHeader bool
if buffer.Start() >= headerLen {
header = buf.With(buffer.ExtendHeader(headerLen))
} else {
_buffer := buf.StackNewSize(buffer.Len() + headerLen)
defer runtime.KeepAlive(_buffer)
header = common.Dup(_buffer)
writeHeader = true
}
err := socks5.AddressSerializer.WriteAddrPort(header, destination)
if err != nil {
header.Release()
return err
}
buffer = buffer.WriteBufferAtFirst(header)
return common.Error(buffer.WriteTo(c))
if writeHeader {
return common.Error(header.WriteTo(c))
} else {
return common.Error(buffer.WriteTo(c))
}
}
type NoneService struct {

14
protocol/shadowsocks/shadowaead/protocol.go
View file

@ -6,6 +6,7 @@ import (
"crypto/sha1"
"io"
"net"
"runtime"
"sync"
"github.com/sagernet/sing/common"
@ -80,8 +81,10 @@ func New(method string, key []byte, password []byte, secureRNG io.Reader, replay
}
func Kdf(key, iv []byte, keyLength int) []byte {
info := []byte("ss-subkey")
subKey := buf.Make(keyLength)
kdf := hkdf.New(sha1.New, key, iv, []byte("ss-subkey"))
kdf := hkdf.New(sha1.New, key, iv, common.Dup(info))
runtime.KeepAlive(info)
common.Must1(io.ReadFull(kdf, common.Dup(subKey)))
return subKey
}
@ -113,6 +116,7 @@ func (m *Method) KeyLength() int {
func (m *Method) ReadRequest(upstream io.Reader) (io.Reader, error) {
_salt := buf.Make(m.keySaltLength)
defer runtime.KeepAlive(_salt)
salt := common.Dup(_salt)
_, err := io.ReadFull(upstream, salt)
if err != nil {
@ -124,11 +128,13 @@ func (m *Method) ReadRequest(upstream io.Reader) (io.Reader, error) {
}
}
key := Kdf(m.key, salt, m.keySaltLength)
defer runtime.KeepAlive(key)
return NewReader(upstream, m.constructor(common.Dup(key)), MaxPacketSize), nil
}
func (m *Method) WriteResponse(upstream io.Writer) (io.Writer, error) {
_salt := buf.Make(m.keySaltLength)
defer runtime.KeepAlive(_salt)
salt := common.Dup(_salt)
common.Must1(io.ReadFull(m.secureRNG, salt))
_, err := upstream.Write(salt)
@ -163,6 +169,7 @@ func (m *Method) DialPacketConn(conn net.Conn) N.PacketConn {
func (m *Method) EncodePacket(buffer *buf.Buffer) error {
key := Kdf(m.key, buffer.To(m.keySaltLength), m.keySaltLength)
c := m.constructor(common.Dup(key))
runtime.KeepAlive(key)
c.Seal(buffer.Index(m.keySaltLength), rw.ZeroBytes[:c.NonceSize()], buffer.From(m.keySaltLength), nil)
buffer.Extend(c.Overhead())
return nil
@ -174,6 +181,7 @@ func (m *Method) DecodePacket(buffer *buf.Buffer) error {
}
key := Kdf(m.key, buffer.To(m.keySaltLength), m.keySaltLength)
c := m.constructor(common.Dup(key))
runtime.KeepAlive(key)
packet, err := c.Open(buffer.Index(m.keySaltLength), rw.ZeroBytes[:c.NonceSize()], buffer.From(m.keySaltLength), nil)
if err != nil {
return err
@ -200,11 +208,13 @@ func (c *clientConn) writeRequest(payload []byte) error {
common.Must1(io.ReadFull(c.method.secureRNG, salt))
key := Kdf(c.method.key, salt, c.method.keySaltLength)
runtime.KeepAlive(_salt)
writer := NewWriter(
c.Conn,
c.method.constructor(common.Dup(key)),
MaxPacketSize,
)
runtime.KeepAlive(key)
header := writer.Buffer()
header.Write(salt)
bufferedWriter := writer.BufferedWriter(header.Len())
@ -240,6 +250,7 @@ func (c *clientConn) readResponse() error {
return nil
}
_salt := buf.Make(c.method.keySaltLength)
defer runtime.KeepAlive(_salt)
salt := common.Dup(_salt)
_, err := io.ReadFull(c.Conn, salt)
if err != nil {
@ -251,6 +262,7 @@ func (c *clientConn) readResponse() error {
}
}
key := Kdf(c.method.key, salt, c.method.keySaltLength)
defer runtime.KeepAlive(key)
c.reader = NewReader(
c.Conn,
c.method.constructor(common.Dup(key)),

7
protocol/shadowsocks/shadowaead/service.go
View file

@ -6,6 +6,7 @@ import (
"io"
"net"
"net/netip"
"runtime"
"sync"
"github.com/sagernet/sing/common"
@ -89,6 +90,7 @@ func (s *Service) NewConnection(ctx context.Context, conn net.Conn, metadata M.M
func (s *Service) newConnection(ctx context.Context, conn net.Conn, metadata M.Metadata) error {
_salt := buf.Make(s.keySaltLength)
defer runtime.KeepAlive(_salt)
salt := common.Dup(_salt)
_, err := io.ReadFull(conn, salt)
@ -127,11 +129,14 @@ func (c *serverConn) writeResponse(payload []byte) (n int, err error) {
common.Must1(io.ReadFull(c.secureRNG, salt))
key := Kdf(c.key, salt, c.keySaltLength)
runtime.KeepAlive(_salt)
writer := NewWriter(
c.Conn,
c.constructor(common.Dup(key)),
MaxPacketSize,
)
runtime.KeepAlive(key)
header := writer.Buffer()
header.Write(salt)
@ -213,6 +218,7 @@ func (s *Service) newPacket(conn N.PacketConn, buffer *buf.Buffer, metadata M.Me
}
key := Kdf(s.key, buffer.To(s.keySaltLength), s.keySaltLength)
c := s.constructor(common.Dup(key))
runtime.KeepAlive(key)
packet, err := c.Open(buffer.Index(s.keySaltLength), rw.ZeroBytes[:c.NonceSize()], buffer.From(s.keySaltLength), nil)
if err != nil {
return err
@ -241,6 +247,7 @@ func (w *serverPacketWriter) WritePacket(buffer *buf.Buffer, destination M.Socks
}
key := Kdf(w.key, buffer.To(w.keySaltLength), w.keySaltLength)
c := w.constructor(common.Dup(key))
runtime.KeepAlive(key)
c.Seal(buffer.From(w.keySaltLength)[:0], rw.ZeroBytes[:c.NonceSize()], buffer.From(w.keySaltLength), nil)
buffer.Extend(c.Overhead())
return w.PacketConn.WritePacket(buffer, w.source)

27
protocol/shadowsocks/shadowaead_2022/protocol.go
View file

@ -9,6 +9,7 @@ import (
"math"
"math/rand"
"net"
"runtime"
"sync"
"sync/atomic"
"time"
@ -231,6 +232,7 @@ func (m *Method) writeExtendedIdentityHeaders(request *buf.Buffer, salt []byte)
header := request.Extend(16)
m.blockConstructor(identitySubkey).Encrypt(header, pskHash)
runtime.KeepAlive(_identitySubkey)
if debug.Enabled {
logger.Trace("encoded ", buf.EncodeHexString(header))
}
@ -252,12 +254,12 @@ func (c *clientConn) writeRequest(payload []byte) error {
common.Must1(io.ReadFull(c.method.secureRNG, salt))
key := Blake3DeriveKey(c.method.psk[:], salt, c.method.keyLength)
writer := shadowaead.NewWriter(
c.Conn,
c.method.constructor(common.Dup(key)),
MaxPacketSize,
)
runtime.KeepAlive(key)
header := writer.Buffer()
header.Write(salt)
@ -344,11 +346,13 @@ func (c *clientConn) readResponse() error {
}
key := Blake3DeriveKey(c.method.psk[:], salt, c.method.keyLength)
runtime.KeepAlive(_salt)
reader := shadowaead.NewReader(
c.Conn,
c.method.constructor(common.Dup(key)),
MaxPacketSize,
)
runtime.KeepAlive(key)
headerType, err := rw.ReadByte(reader)
if err != nil {
@ -385,6 +389,7 @@ func (c *clientConn) readResponse() error {
}
return ErrBadRequestSalt
}
runtime.KeepAlive(_requestSalt)
c.requestSalt = nil
c.reader = reader
@ -472,10 +477,21 @@ func (c *clientPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksad
logger.Trace("begin client packet")
}
defer buffer.Release()
_header := buf.StackNew()
header := common.Dup(_header)
var hdrLen int
if c.method.udpCipher != nil {
hdrLen = PacketNonceSize
}
hdrLen += 16 // packet header
pskLen := len(c.method.pskList)
if c.method.udpCipher == nil && pskLen > 1 {
hdrLen += (pskLen - 1) * aes.BlockSize
}
hdrLen += 1 // header type
hdrLen += 8 // timestamp
hdrLen += 1 // padding length
hdrLen += socks5.AddressSerializer.AddrPortLen(destination)
header := buf.With(buffer.ExtendHeader(hdrLen))
var dataIndex int
if c.method.udpCipher != nil {
common.Must1(header.ReadFullFrom(c.method.secureRNG, PacketNonceSize))
@ -540,7 +556,6 @@ func (c *clientPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksad
if err != nil {
return err
}
buffer = buffer.WriteBufferAtFirst(header)
if err != nil {
return err
}
@ -606,6 +621,7 @@ func (c *clientPacketConn) ReadPacket(buffer *buf.Buffer) (M.Socksaddr, error) {
} else {
key := Blake3DeriveKey(c.method.psk[:], packetHeader[:8], c.method.keyLength)
remoteCipher = c.method.constructor(common.Dup(key))
runtime.KeepAlive(key)
}
_, err = remoteCipher.Open(buffer.Index(0), packetHeader[4:16], buffer.Bytes(), nil)
if err != nil {
@ -717,6 +733,7 @@ func (m *Method) newUDPSession() *udpSession {
binary.BigEndian.PutUint64(sessionId, session.sessionId)
key := Blake3DeriveKey(m.psk[:], sessionId, m.keyLength)
session.cipher = m.constructor(common.Dup(key))
runtime.KeepAlive(key)
}
return session
}

7
protocol/shadowsocks/shadowaead_2022/service.go
View file

@ -8,6 +8,7 @@ import (
"io"
"math"
"net"
"runtime"
"sync"
"sync/atomic"
"time"
@ -110,6 +111,7 @@ func (s *Service) newConnection(ctx context.Context, conn net.Conn, metadata M.M
s.constructor(common.Dup(requestKey)),
MaxPacketSize,
)
runtime.KeepAlive(requestKey)
headerType, err := rw.ReadByte(reader)
if err != nil {
@ -192,11 +194,13 @@ func (c *serverConn) writeResponse(payload []byte) (n int, err error) {
salt := common.Dup(_salt[:])
common.Must1(io.ReadFull(c.secureRNG, salt))
key := Blake3DeriveKey(c.uPSK[:], salt, c.keyLength)
runtime.KeepAlive(_salt)
writer := shadowaead.NewWriter(
c.Conn,
c.constructor(common.Dup(key)),
MaxPacketSize,
)
runtime.KeepAlive(key)
header := writer.Buffer()
header.Write(salt)
bufferedWriter := writer.BufferedWriter(header.Len())
@ -306,6 +310,7 @@ func (s *Service) newPacket(conn N.PacketConn, buffer *buf.Buffer, metadata M.Me
if packetHeader != nil {
key := Blake3DeriveKey(s.psk[:], packetHeader[:8], s.keyLength)
session.remoteCipher = s.constructor(common.Dup(key))
runtime.KeepAlive(key)
}
}
goto process
@ -382,6 +387,7 @@ func (w *serverPacketWriter) WritePacket(buffer *buf.Buffer, destination M.Socks
defer buffer.Release()
_header := buf.StackNew()
defer runtime.KeepAlive(_header)
header := common.Dup(_header)
var dataIndex int
@ -446,6 +452,7 @@ func (m *Service) newUDPSession() *serverUDPSession {
binary.BigEndian.PutUint64(sessionId, session.sessionId)
key := Blake3DeriveKey(m.psk[:], sessionId, m.keyLength)
session.cipher = m.constructor(common.Dup(key))
runtime.KeepAlive(key)
}
return session
}

5
protocol/shadowsocks/shadowaead_2022/service_multi.go
View file

@ -7,6 +7,7 @@ import (
"io"
"math"
"net"
"runtime"
"time"
"github.com/sagernet/sing/common"
@ -106,6 +107,7 @@ func (s *MultiService[U]) newConnection(ctx context.Context, conn net.Conn, meta
identitySubkey := common.Dup(_identitySubkey)
blake3.DeriveKey(identitySubkey, "shadowsocks 2022 identity subkey", keyMaterial)
s.blockConstructor(identitySubkey).Decrypt(eiHeader, eiHeader)
runtime.KeepAlive(_identitySubkey)
var user U
var uPSK [KeySaltSize]byte
@ -122,6 +124,7 @@ func (s *MultiService[U]) newConnection(ctx context.Context, conn net.Conn, meta
s.constructor(common.Dup(requestKey)),
MaxPacketSize,
)
runtime.KeepAlive(requestSalt)
headerType, err := rw.ReadByte(reader)
if err != nil {
@ -220,6 +223,7 @@ func (s *MultiService[U]) newPacket(conn N.PacketConn, buffer *buf.Buffer, metad
session.remoteSessionId = sessionId
key := Blake3DeriveKey(uPSK[:], packetHeader[:8], s.keyLength)
session.remoteCipher = s.constructor(common.Dup(key))
runtime.KeepAlive(key)
}
goto process
@ -299,5 +303,6 @@ func (m *MultiService[U]) newUDPSession(uPSK [KeySaltSize]byte) *serverUDPSessio
binary.BigEndian.PutUint64(sessionId, session.sessionId)
key := Blake3DeriveKey(uPSK[:], sessionId, m.keyLength)
session.cipher = m.constructor(common.Dup(key))
runtime.KeepAlive(key)
return session
}

5
protocol/socks5/conn.go
View file

@ -2,6 +2,7 @@ package socks5
import (
"net"
"runtime"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -44,6 +45,7 @@ func (c *AssociateConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
func (c *AssociateConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
common.Must(buffer.WriteZeroN(3))
err = AddressSerializer.WriteAddrPort(buffer, M.SocksaddrFromNet(addr))
@ -66,6 +68,7 @@ func (c *AssociateConn) Read(b []byte) (n int, err error) {
func (c *AssociateConn) Write(b []byte) (n int, err error) {
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
common.Must(buffer.WriteZeroN(3))
err = AddressSerializer.WriteAddrPort(buffer, c.dest)
@ -134,6 +137,7 @@ func (c *AssociatePacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err erro
func (c *AssociatePacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
common.Must(buffer.WriteZeroN(3))
@ -156,6 +160,7 @@ func (c *AssociatePacketConn) Read(b []byte) (n int, err error) {
func (c *AssociatePacketConn) Write(b []byte) (n int, err error) {
_buffer := buf.StackNew()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
common.Must(buffer.WriteZeroN(3))

5
protocol/trojan/protocol.go
View file

@ -6,6 +6,7 @@ import (
"encoding/hex"
"io"
"net"
"runtime"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -149,9 +150,11 @@ func ClientHandshake(conn net.Conn, key [KeyLength]byte, destination M.Socksaddr
var writeHeader bool
if len(payload) > 0 && headerLen+len(payload) < 65535 {
buffer := buf.Make(headerLen + len(payload))
defer runtime.KeepAlive(buffer)
header = buf.With(common.Dup(buffer))
} else {
buffer := buf.Make(headerLen)
defer runtime.KeepAlive(buffer)
header = buf.With(common.Dup(buffer))
writeHeader = true
}
@ -185,6 +188,7 @@ func ClientHandshakePacket(conn net.Conn, key [KeyLength]byte, destination M.Soc
header = buf.With(payload.ExtendHeader(headerLen))
} else {
buffer := buf.Make(headerLen)
defer runtime.KeepAlive(buffer)
header = buf.With(common.Dup(buffer))
writeHeader = true
}
@ -246,6 +250,7 @@ func WritePacket(conn net.Conn, buffer *buf.Buffer, destination M.Socksaddr) err
} else {
writeHeader = true
_buffer := buf.Make(headerOverload)
defer runtime.KeepAlive(_buffer)
header = buf.With(common.Dup(_buffer))
}
common.Must(socks5.AddressSerializer.WriteAddrPort(header, destination))

2
transport/mixed/listener.go
View file

@ -7,6 +7,7 @@ import (
"net"
netHttp "net/http"
"net/netip"
"runtime"
"strings"
"github.com/sagernet/sing"
@ -99,6 +100,7 @@ func (l *Listener) NewConnection(ctx context.Context, conn net.Conn, metadata M.
if reader.Buffered() > 0 {
_buffer := buf.StackNewSize(reader.Buffered())
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
_, err = buffer.ReadFullFrom(reader, reader.Buffered())
if err != nil {

3
transport/udp/udp.go
View file

@ -3,6 +3,7 @@ package udp
import (
"net"
"net/netip"
"runtime"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/buf"
@ -91,6 +92,7 @@ func (l *Listener) Close() error {
func (l *Listener) loop() {
_buffer := buf.StackNewMax()
defer runtime.KeepAlive(_buffer)
buffer := common.Dup(_buffer)
data := buffer.Cut(buf.ReversedHeader, buf.ReversedHeader).Slice()
if !l.tproxy {
@ -111,6 +113,7 @@ func (l *Listener) loop() {
}
} else {
_oob := make([]byte, 1024)
defer runtime.KeepAlive(_oob)
oob := common.Dup(_oob)
for {
n, oobN, _, addr, err := l.ReadMsgUDPAddrPort(data, oob)