check kafka pkt length before parsing clientid

grafana · Jun 6, 2024 · f2639b8 · f2639b8
1 parent 294a8d9
commit f2639b8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/internal/ebpf/common/kafka_detect_transform.go b/pkg/internal/ebpf/common/kafka_detect_transform.go
@@ -42,7 +42,7 @@ func (k Operation) String() string {
 	}
 }
 
-const KafaMinLength = 14
+const KafkaMinLength = 14
 
 // ProcessKafkaRequest processes a TCP packet and returns error if the packet is not a valid Kafka request.
 // Otherwise, return kafka.Info with the processed data.
@@ -57,7 +57,7 @@ func ProcessPossibleKafkaEvent(pkt []byte, rpkt []byte) (*KafkaInfo, error) {
 
 func ProcessKafkaRequest(pkt []byte) (*KafkaInfo, error) {
 	k := &KafkaInfo{}
-	if len(pkt) < KafaMinLength {
+	if len(pkt) < KafkaMinLength {
 		return k, errors.New("packet too short")
 	}
 
@@ -73,8 +73,8 @@ func ProcessKafkaRequest(pkt []byte) (*KafkaInfo, error) {
 		return k, errors.New("invalid Kafka request header")
 	}
 
-	offset := KafaMinLength
-	if header.ClientIDSize > 0 {
+	offset := KafkaMinLength
+	if header.ClientIDSize > 0 && len(pkt) > KafkaMinLength+int(header.ClientIDSize) {
 		clientID := pkt[offset : offset+int(header.ClientIDSize)]
 		if !isValidClientID(clientID, int(header.ClientIDSize)) {
 			return k, errors.New("invalid client ID")
@@ -109,7 +109,7 @@ func ProcessKafkaRequest(pkt []byte) (*KafkaInfo, error) {
 }
 
 func isValidKafkaHeader(header *Header) bool {
-	if header.MessageSize < int32(KafaMinLength) || header.APIVersion < 0 {
+	if header.MessageSize < int32(KafkaMinLength) || header.APIVersion < 0 {
 		return false
 	}
 	switch Operation(header.APIKey) {