Skip to content

fix(csysdig): don't let syslog parse enter events #2179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
therealbobo merged 1 commit into from
Jan 29, 2026
+41 −24
Merged

fix(csysdig): don't let syslog parse enter events #2179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion userspace/sysdig/csysdig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,17 @@ captureinfo do_inspect(sinsp* inspector,

syslog_decoder->reset();
res = inspector->next(&ev);
syslog_decoder->parse(ev);
if (ev)
{
const uint16_t etype = ev->get_scap_evt()->type;
if (etype == PPME_SYSCALL_WRITE_X || etype == PPME_SYSCALL_WRITEV_X ||
etype == PPME_SYSCALL_PWRITE_X || etype == PPME_SYSCALL_PWRITEV_X ||
etype == PPME_SOCKET_SEND_X || etype == PPME_SOCKET_SENDTO_X ||
etype == PPME_SOCKET_SENDMSG_X || etype == PPME_SOCKET_SENDMMSG_X)
{
syslog_decoder->parse(ev);
}
}

if(res == SCAP_TIMEOUT || res == SCAP_FILTERED_EVENT)
{
Expand Down
12 changes: 11 additions & 1 deletion userspace/sysdig/sysdig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,17 @@ captureinfo do_inspect(sinsp *inspector, sinsp_cycledumper *dumper,
}
syslog_decoder->reset();
res = inspector->next(&ev);
syslog_decoder->parse(ev);
if (ev)
{
const uint16_t etype = ev->get_scap_evt()->type;
if (etype == PPME_SYSCALL_WRITE_X || etype == PPME_SYSCALL_WRITEV_X ||
etype == PPME_SYSCALL_PWRITE_X || etype == PPME_SYSCALL_PWRITEV_X ||
etype == PPME_SOCKET_SEND_X || etype == PPME_SOCKET_SENDTO_X ||
etype == PPME_SOCKET_SENDMSG_X || etype == PPME_SOCKET_SENDMMSG_X)
{
syslog_decoder->parse(ev);
}
}

if(dumper && ev && res != SCAP_EOF)
{
Expand Down
41 changes: 19 additions & 22 deletions userspace/sysdig/utils/sinsp_syslog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,34 +76,31 @@ std::string sinsp_syslog_decoder::get_info_line() const {
}

void sinsp_syslog_decoder::parse(sinsp_evt* evt) {
if(!evt || !evt->get_fd_info()) {
const sinsp_evt_param *parinfo = nullptr;
uint16_t etype = evt->get_scap_evt()->type;

if((etype == PPME_SOCKET_SENDMMSG_X) &&
evt->get_num_params() == 0) {
return;
}

if (evt->get_syscall_return_value() < 0) {
return;
}

// Check if this is a syslog fd
if(!evt->get_fd_info()->is_syslog()) {
if(evt->get_fd_info() == nullptr || !evt->get_fd_info()->is_syslog()) {
return;
}

// Extract the data buffer based on event type
uint16_t etype = evt->get_type();
const sinsp_evt_param* parinfo = nullptr;

// Determine which parameter contains the data based on event type
if(etype == PPME_SOCKET_SENDMMSG_X) {
parinfo = evt->get_param(2);
} else if(etype == PPME_SYSCALL_READV_X || etype == PPME_SYSCALL_PREADV_X ||
etype == PPME_SOCKET_RECVMSG_X) {
parinfo = evt->get_param(2);
} else if(etype == PPME_SOCKET_RECVMMSG_X) {
parinfo = evt->get_param(3);
} else {
parinfo = evt->get_param(1);
}

if(parinfo) {
const char* data = parinfo->m_val;
uint32_t datalen = parinfo->m_len;
parse_data(data, datalen);
}
if(etype == PPME_SOCKET_SENDMMSG_X) {
parinfo = evt->get_param(3);
} else {
parinfo = evt->get_param(1);
}

const char* data = parinfo->m_val;
uint32_t datalen = parinfo->m_len;
parse_data(data, datalen);
}