Skip to content

Commit e912675

Browse files
committed
fix: fix security_socket_recvmsg/sendmsg attach error
1 parent a8bd148 commit e912675

6 files changed

Lines changed: 30 additions & 28 deletions

bpf/agent_arm64_bpfel.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/agent_x86_bpfel.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/agentlagacykernel310_arm64_bpfel.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/agentlagacykernel310_x86_bpfel.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bpf/pktlatency.bpf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ static __always_inline int handle_security_socket_sendmsg() {
13981398
}
13991399

14001400
SEC("fentry/security_socket_sendmsg")
1401-
int BPF_PROG(fentry_security_socket_sendmsg) {
1401+
int BPF_PROG(fentry__security_socket_sendmsg) {
14021402
return handle_security_socket_sendmsg();
14031403
}
14041404

@@ -1418,7 +1418,7 @@ static __always_inline int handle_security_socket_recvmsg() {
14181418
}
14191419

14201420
SEC("fentry/security_socket_recvmsg")
1421-
int BPF_PROG(fentry_security_socket_recvmsg) {
1421+
int BPF_PROG(fentry__security_socket_recvmsg) {
14221422
return handle_security_socket_recvmsg();
14231423
}
14241424

bpf/prog.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,14 +238,14 @@ func AttachNfNatPacket() (link.Link, error) {
238238
/* security_socket_recvmsg */
239239
func AttachKProbeSecuritySocketRecvmsgEntry() (link.Link, error) {
240240
return FentryOrKprobe("security_socket_recvmsg", GetProgramFromObjs(Objs, "FentrySecuritySocketRecvmsg"),
241-
GetProgramFromObjs(Objs, "SecuritySocketRecvmsgRet"))
241+
GetProgramFromObjs(Objs, "SecuritySocketRecvmsgEnter"))
242242
// return Kprobe("security_socket_recvmsg", GetProgramFromObjs(Objs, "SecuritySocketRecvmsgEnter"))
243243
}
244244

245245
/* security_socket_sendmsg */
246246
func AttachKProbeSecuritySocketSendmsgEntry() (link.Link, error) {
247247
return FentryOrKprobe("security_socket_sendmsg", GetProgramFromObjs(Objs, "FentrySecuritySocketSendmsg"),
248-
GetProgramFromObjs(Objs, "SecuritySocketSendmsgRet"))
248+
GetProgramFromObjs(Objs, "SecuritySocketSendmsgEnter"))
249249
// return Kprobe("security_socket_sendmsg", GetProgramFromObjs(Objs, "SecuritySocketSendmsgEnter"))
250250
}
251251

@@ -358,6 +358,7 @@ func FentryOrTracepoint(func_name string, fentryProg *ebpf.Program, group string
358358
func FentryOrKprobe(func_name string, fentryProg *ebpf.Program, kprobeProg *ebpf.Program) (link.Link, error) {
359359
l, err := Fentry(func_name, fentryProg)
360360
if err != nil {
361+
common.BPFLog.Errorf("failed to attach fentry, func_name: %s, err: %v", func_name, err)
361362
l, err = Kprobe(func_name, kprobeProg)
362363
if err != nil {
363364
common.BPFLog.Errorf("failed to attach fentry or kprobe, func_name: %s, err: %v", func_name, err)
@@ -377,6 +378,7 @@ func FentryOrKprobe(func_name string, fentryProg *ebpf.Program, kprobeProg *ebpf
377378
func FexitOrTracepoint(func_name string, fexitProg *ebpf.Program, group string, name string, tracepointProg *ebpf.Program) (link.Link, error) {
378379
l, err := Fexit(func_name, fexitProg)
379380
if err != nil {
381+
common.BPFLog.Errorf("failed to attach fexit, func_name: %s, err: %v", func_name, err)
380382
l, err = Tracepoint(group, name, tracepointProg)
381383
if err != nil {
382384
common.BPFLog.Errorf("failed to attach fexit or tracepoint, group: %s name: %s, err: %v", group, name, err)

0 commit comments

Comments
 (0)