Check lenth of the udp packet before parsing

proxy/socks/protocol/udp.go

@@ -7,6 +7,7 @@ import (
 	"github.com/v2ray/v2ray-core/common/alloc"
 	"github.com/v2ray/v2ray-core/common/log"
 	v2net "github.com/v2ray/v2ray-core/common/net"
+	"github.com/v2ray/v2ray-core/transport"
 )
 
 var (
@@ -37,7 +38,12 @@ func (request *Socks5UDPRequest) Write(buffer *alloc.Buffer) {
 	buffer.Append(request.Data.Value)
 }
 
-func ReadUDPRequest(packet []byte) (request Socks5UDPRequest, err error) {
+func ReadUDPRequest(packet []byte) (*Socks5UDPRequest, error) {
+	if len(packet) < 5 {
+		return nil, transport.CorruptedPacket
+	}
+	request := new(Socks5UDPRequest)
+
 	// packet[0] and packet[1] are reserved
 	request.Fragment = packet[2]
 
@@ -46,28 +52,38 @@ func ReadUDPRequest(packet []byte) (request Socks5UDPRequest, err error) {
 
 	switch addrType {
 	case AddrTypeIPv4:
+		if len(packet) < 10 {
+			return nil, transport.CorruptedPacket
+		}
 		ip := packet[4:8]
 		port := binary.BigEndian.Uint16(packet[8:10])
 		request.Address = v2net.IPAddress(ip, port)
 		dataBegin = 10
 	case AddrTypeIPv6:
+		if len(packet) < 22 {
+			return nil, transport.CorruptedPacket
+		}
 		ip := packet[4:20]
 		port := binary.BigEndian.Uint16(packet[20:22])
 		request.Address = v2net.IPAddress(ip, port)
 		dataBegin = 22
 	case AddrTypeDomain:
 		domainLength := int(packet[4])
+		if len(packet) < 5+domainLength+2 {
+			return nil, transport.CorruptedPacket
+		}
 		domain := string(packet[5 : 5+domainLength])
 		port := binary.BigEndian.Uint16(packet[5+domainLength : 5+domainLength+2])
 		request.Address = v2net.DomainAddress(domain, port)
 		dataBegin = 5 + domainLength + 2
 	default:
 		log.Warning("Unknown address type %d", addrType)
-		err = ErrorUnknownAddressType
+		return nil, ErrorUnknownAddressType
-		return
 	}
 
-	request.Data = alloc.NewBuffer().Clear().Append(packet[dataBegin:])
+	if len(packet) > dataBegin {
+		request.Data = alloc.NewBuffer().Clear().Append(packet[dataBegin:])
+	}
 
-	return
+	return request, nil
 }

proxy/socks/udp.go

@@ -46,7 +46,9 @@ func (server *SocksServer) AcceptPackets(conn *net.UDPConn) error {
 		buffer.Release()
 		if err != nil {
 			log.Error("Socks failed to parse UDP request: %v", err)
-			request.Data.Release()
+			continue
+		}
+		if request.Data == nil || request.Data.Len() == 0 {
 			continue
 		}
 		if request.Fragment != 0 {