From 5b3c906682514eeef360b63258156b8f51a25025 Mon Sep 17 00:00:00 2001 From: toby cabot Date: Thu, 11 May 2023 16:47:41 -0400 Subject: [PATCH 1/2] Update libbpfgo to the last version embedded in tracee TracePrint() was replaced by helpers.TracePipeListen(). --- go.mod | 2 +- go.sum | 19 +++++++++++++++---- hello.go | 3 ++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 99fe3dc..ae83cb1 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module github.com/lizrice/ebpf-beginners go 1.15 -require github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210130081938-febd3de75f55 +require github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210518164823-94530727cde4 diff --git a/go.sum b/go.sum index d824c72..b573d87 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,15 @@ -github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210120135515-7d2ce345dfca h1:oibleOqVmXmuag/wuOj6xyJDPNemtOc3QsKS3oozw/s= -github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210120135515-7d2ce345dfca/go.mod h1:Ldem7RTRbX6bdTDxU2eYYvo7pPWYQbbc6rdGv0Ilyts= -github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210130081938-febd3de75f55 h1:qlZfsrz4nQ8IcIu4AL/RGNSyh9f9oTigzDNz/0RhReE= -github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210130081938-febd3de75f55/go.mod h1:Ldem7RTRbX6bdTDxU2eYYvo7pPWYQbbc6rdGv0Ilyts= +github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210518164823-94530727cde4 h1:46arhhxBEYn4SaVliz7bZwVGRrdYUbiVEYNW0kESnnY= +github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210518164823-94530727cde4/go.mod h1:PgXimFYUSx0PfQFRIyl770Jowy6O3r7iJOr39dt1bss= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg= +golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/hello.go b/hello.go index a152f65..e7494bc 100644 --- a/hello.go +++ b/hello.go @@ -4,6 +4,7 @@ import ( "C" bpf "github.com/aquasecurity/tracee/libbpfgo" + "github.com/aquasecurity/tracee/libbpfgo/helpers" ) import ( "fmt" @@ -27,7 +28,7 @@ func main() { _, err = prog.AttachKprobe(sys_execve) must(err) - go bpf.TracePrint() + go helpers.TracePipeListen() prog, err = bpfModule.GetProgram("hello_bpftrace") must(err) From cd99ef806e5a33a581ab24158d042879b63effbe Mon Sep 17 00:00:00 2001 From: toby cabot Date: Fri, 12 May 2023 08:57:54 -0400 Subject: [PATCH 2/2] Switch libbpfgo to standalone version Evidenly libbpfgo started life as a module within the Tracee project, but then was moved into its own repo. This commit switches from the last tracee version to the first standalone version so hopefully there will be as few changes as possible except for the package name. Signed-off-by: toby cabot --- go.mod | 2 +- go.sum | 8 ++++---- hello.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index ae83cb1..22692b3 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module github.com/lizrice/ebpf-beginners go 1.15 -require github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210518164823-94530727cde4 +require github.com/aquasecurity/libbpfgo v0.1.0 diff --git a/go.sum b/go.sum index b573d87..e36a3f9 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210518164823-94530727cde4 h1:46arhhxBEYn4SaVliz7bZwVGRrdYUbiVEYNW0kESnnY= -github.com/aquasecurity/tracee/libbpfgo v0.0.0-20210518164823-94530727cde4/go.mod h1:PgXimFYUSx0PfQFRIyl770Jowy6O3r7iJOr39dt1bss= +github.com/aquasecurity/libbpfgo v0.1.0 h1:14V7ISF45XVqwBre+7NCDByy77OuwFgzDjVR+0JltZ8= +github.com/aquasecurity/libbpfgo v0.1.0/go.mod h1:/+clceXE103FaXvVTIY2HAkQjxNtkra4DRWvZYr2SKw= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -7,8 +7,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492 h1:Paq34FxTluEPvVyayQqMPgHm+vTOrIifmcYxFBx9TLg= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 h1:hZR0X1kPW+nwyJ9xRxqZk1vx5RUObAPBdKVvXPDUH/E= +golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= diff --git a/hello.go b/hello.go index e7494bc..a015878 100644 --- a/hello.go +++ b/hello.go @@ -3,8 +3,8 @@ package main import ( "C" - bpf "github.com/aquasecurity/tracee/libbpfgo" - "github.com/aquasecurity/tracee/libbpfgo/helpers" + bpf "github.com/aquasecurity/libbpfgo" + "github.com/aquasecurity/libbpfgo/helpers" ) import ( "fmt"