fix: fix mysql protcol parser array index out of range issue and gotl…

…s load failed issue (#246) * fix: fix gotls load failed * fix: crash issue and gotls load failed issue
hengyoush · Jan 3, 2025 · cb48df0 · cb48df0
1 parent 6d0b142
commit cb48df0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/agent/protocol/mysql/handler.go b/agent/protocol/mysql/handler.go
@@ -318,7 +318,7 @@ func ProcessBinaryResultsetRowPacket(packet *MysqlPacket, columnDefs []ColDefini
 		common.ProtocolParserLog.Warningln("Not enough bytes.")
 	}
 
-	nullBitmap := packet.msg[kBinaryResultsetRowHeaderOffset:nullBitmapLen]
+	nullBitmap := packet.msg[kBinaryResultsetRowHeaderOffset : kBinaryResultsetRowHeaderOffset+nullBitmapLen]
 
 	for i := 0; i < len(columnDefs); i++ {
 		null_bitmap_bytepos := (i + kBinaryResultsetRowNullBitmapOffset) / 8

diff --git a/bpf/gotls.bpf.c b/bpf/gotls.bpf.c
@@ -121,11 +121,10 @@ static __inline void assign_arg(void* arg, size_t arg_size, struct location_t lo
   if (loc.type == kLocationTypeStack) {
     bpf_probe_read(arg, arg_size, sp + loc.offset);
   } else if (loc.type == kLocationTypeRegisters) {
-    if (loc.offset >= 0) {
-      if (loc.offset <= (1<<10)) {
-        bpf_probe_read(arg, arg_size, (char*)regs + loc.offset);
-      }
+    if (loc.offset < 0 || loc.offset > 1000) {
+      return;
     }
+    bpf_probe_read(arg, arg_size, (char*)regs + loc.offset);
   }
 }