From 0616dfbf1d20c2f25373daf4bcb774ccb0e0875c Mon Sep 17 00:00:00 2001 From: Mauro Ezequiel Moltrasio Date: Wed, 28 Aug 2024 16:05:50 +0200 Subject: [PATCH] fix(unit-tests): fixes after adding arguments to recvmmsg and sendmmsg Signed-off-by: Mauro Ezequiel Moltrasio --- .../events/syscall_dispatched_events/recvmmsg.bpf.c | 2 +- .../events/syscall_dispatched_events/sendmmsg.bpf.c | 2 +- userspace/libsinsp/test/public_sinsp_API/ppm_sc_codes.cpp | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/recvmmsg.bpf.c b/driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/recvmmsg.bpf.c index 24c1b72775..6cc6797688 100644 --- a/driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/recvmmsg.bpf.c +++ b/driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/recvmmsg.bpf.c @@ -83,7 +83,7 @@ static long handle_exit(uint32_t index, void *ctx) * have in the buffer. */ uint16_t snaplen = maps__get_snaplen(); - apply_dynamic_snaplen(data->regs, &snaplen, true, NULL); + apply_dynamic_snaplen(data->regs, &snaplen, true, PPME_SOCKET_RECVMMSG_X); if(snaplen > mmh.msg_len) { snaplen = mmh.msg_len; diff --git a/driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/sendmmsg.bpf.c b/driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/sendmmsg.bpf.c index 6145186244..ab73e4b950 100644 --- a/driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/sendmmsg.bpf.c +++ b/driver/modern_bpf/programs/tail_called/events/syscall_dispatched_events/sendmmsg.bpf.c @@ -145,7 +145,7 @@ static long handle_exit(uint32_t index, void *ctx) */ uint16_t snaplen = maps__get_snaplen(); // TODO: check sockaddr - apply_dynamic_snaplen(data->regs, &snaplen, true, NULL); + apply_dynamic_snaplen(data->regs, &snaplen, true, PPME_SOCKET_SENDMMSG_X); if(mmh.msg_len > 0 && snaplen > mmh.msg_len) { snaplen = mmh.msg_len; diff --git a/userspace/libsinsp/test/public_sinsp_API/ppm_sc_codes.cpp b/userspace/libsinsp/test/public_sinsp_API/ppm_sc_codes.cpp index 6a78fe02b5..bbbabb625c 100644 --- a/userspace/libsinsp/test/public_sinsp_API/ppm_sc_codes.cpp +++ b/userspace/libsinsp/test/public_sinsp_API/ppm_sc_codes.cpp @@ -124,10 +124,14 @@ const libsinsp::events::set expected_sinsp_state_event_set = { PPME_SOCKET_RECVFROM_X, PPME_SOCKET_RECVMSG_E, PPME_SOCKET_RECVMSG_X, + PPME_SOCKET_RECVMMSG_E, + PPME_SOCKET_RECVMMSG_X, PPME_SOCKET_GETSOCKOPT_E, PPME_SOCKET_GETSOCKOPT_X, PPME_SOCKET_SENDMSG_E, PPME_SOCKET_SENDMSG_X, + PPME_SOCKET_SENDMMSG_E, + PPME_SOCKET_SENDMMSG_X, PPME_SOCKET_SENDTO_E, PPME_SOCKET_SENDTO_X, PPME_SYSCALL_SETGID_E, @@ -254,8 +258,10 @@ const libsinsp::events::set expected_sinsp_state_sc_set = { PPM_SC_PRLIMIT64, PPM_SC_RECVFROM, PPM_SC_RECVMSG, + PPM_SC_RECVMMSG, PPM_SC_GETSOCKOPT, PPM_SC_SENDMSG, + PPM_SC_SENDMMSG, PPM_SC_SENDTO, PPM_SC_SETGID, PPM_SC_SETGID32,