GuanM/hysteria
1
0
Fork 0
mirror of https://github.com/cedar2025/hysteria.git synced 2025-06-17 01:59:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: slices mis-reused in socks5UDPConn.ReadFrom

Browse Source 
fix:
This commit is contained in:
Haruue Icymoon 2023-02-07 23:47:11 +08:00
parent 810bfd7022
commit 30e17a40c0
No known key found for this signature in database
GPG Key ID: F6083B28CBCBC148
1 changed files with 7 additions and 2 deletions

9
core/transport/socks5.go

@ -216,6 +216,11 @@ func (c *socks5UDPConn) Close() error {
} }
func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, error) { func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, error) {
clone := func(b []byte) []byte {
c := make([]byte, len(b))
copy(c, b)
return c
}
iPort := int(binary.BigEndian.Uint16(port)) iPort := int(binary.BigEndian.Uint16(port))
switch atyp { switch atyp {
case socks5.ATYPIPv4: case socks5.ATYPIPv4:
@ -223,7 +228,7 @@ func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, err
return nil, errors.New("invalid ipv4 address") return nil, errors.New("invalid ipv4 address")
} }
return &net.UDPAddr{ return &net.UDPAddr{
IP: net.IPv4(addr[0], addr[1], addr[2], addr[3]), IP: clone(addr),
Port: iPort, Port: iPort,
}, nil }, nil
case socks5.ATYPIPv6: case socks5.ATYPIPv6:
@ -231,7 +236,7 @@ func socks5AddrToUDPAddr(atyp byte, addr []byte, port []byte) (*net.UDPAddr, err
return nil, errors.New("invalid ipv6 address") return nil, errors.New("invalid ipv6 address")
} }
return &net.UDPAddr{ return &net.UDPAddr{
IP: addr, IP: clone(addr),
Port: iPort, Port: iPort,
}, nil }, nil
case socks5.ATYPDomain: case socks5.ATYPDomain: