diff --git a/ebpftracer/tracer.go b/ebpftracer/tracer.go index 1277aee5..0b9d0d19 100644 --- a/ebpftracer/tracer.go +++ b/ebpftracer/tracer.go @@ -4,7 +4,6 @@ import ( "bytes" "compress/gzip" "encoding/base64" - "encoding/binary" "errors" "fmt" "io" @@ -17,6 +16,7 @@ import ( "sync" "sync/atomic" "time" + "unsafe" "github.com/cilium/ebpf" "github.com/cilium/ebpf/link" @@ -468,13 +468,12 @@ func runEventsReader(name string, r *perf.Reader, ch chan<- Event, typ perfMapTy switch typ { case perfMapTypeL7Events: - v := &l7Event{} data := rec.RawSample - - if err := binary.Read(bytes.NewBuffer(data), binary.LittleEndian, v); err != nil { - klog.Warningln("failed to read l7 event:", err) + if len(data) < int(unsafe.Sizeof(l7Event{})) { + klog.Warningln("failed to read l7 event: data too short") continue } + v := (*l7Event)(unsafe.Pointer(&data[0])) // Extract payload data directly from the struct arrays payloadSize := min(int(v.PayloadSize), len(v.Payload)) @@ -507,25 +506,27 @@ func runEventsReader(name string, r *perf.Reader, ch chan<- Event, typ perfMapTy L7Request: req, } case perfMapTypeFileEvents: - v := &fileEvent{} - if err := binary.Read(bytes.NewBuffer(rec.RawSample), binary.LittleEndian, v); err != nil { - klog.Warningln("failed to read file event:", err) + if len(rec.RawSample) < int(unsafe.Sizeof(fileEvent{})) { + klog.Warningln("failed to read file event: data too short") continue } + v := (*fileEvent)(unsafe.Pointer(&rec.RawSample[0])) event = Event{Type: v.Type, Pid: v.Pid, Fd: v.Fd, Mnt: v.Mnt, Log: v.Log > 0} case perfMapTypeProcEvents: - v := &procEvent{} - if err := binary.Read(bytes.NewBuffer(rec.RawSample), binary.LittleEndian, v); err != nil { - klog.Warningln("failed to read proc event:", err) + if len(rec.RawSample) < int(unsafe.Sizeof(procEvent{})) { + klog.Warningln("failed to read proc event: data too short") continue } + v := (*procEvent)(unsafe.Pointer(&rec.RawSample[0])) event = Event{Type: v.Type, Reason: EventReason(v.Reason), Pid: v.Pid} case perfMapTypeTCPEvents: - v := &tcpEvent{} - if err := binary.Read(bytes.NewBuffer(rec.RawSample), binary.LittleEndian, v); err != nil { - klog.Warningln("failed to read tcp event:", err) + // tcpEvent size is 102 bytes, but Go struct is 104 bytes due to padding. + // We check for 102 bytes. + if len(rec.RawSample) < 102 { + klog.Warningln("failed to read tcp event: data too short") continue } + v := (*tcpEvent)(unsafe.Pointer(&rec.RawSample[0])) event = Event{ Type: v.Type, Pid: v.Pid,