Skip to content

Fix uninitialized vars and sys call crash #54

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
tanelpoder merged 1 commit into from
Dec 11, 2024
Merged

Fix uninitialized vars and sys call crash #54

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
2 changes: 1 addition & 1 deletion next/src/xcapture.bpf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ int get_tasks(struct bpf_iter__task *ctx)

t->pid = task->pid;
t->tgid = task->tgid;
t->flags = task->flags;
t->flags = task->flags;
t->state = get_task_state(task);
bpf_probe_read_kernel_str(t->comm, TASK_COMM_LEN, task->comm);
t->euid = BPF_CORE_READ(task, cred, euid.val);
Expand Down
17 changes: 12 additions & 5 deletions next/src/xcapture.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,21 @@ static const char *get_task_state(__u32 state)
}
}

static const char *safe_syscall_name(__u32 syscall_nr) {
if (syscall_nr > NR_SYSCALLS) {
return "<unknown>";
}

return sysent0[syscall_nr].name;
}

int main(int argc, char **argv)
{
struct xcapture_bpf *skel;
struct xcapture_bpf *skel = 0;
struct task_info buf;
int iter_fd;
ssize_t ret;
int err;
int iter_fd = 0;
ssize_t ret = 0;
int err = 0;


/* Open, load, and verify BPF application */
Expand Down Expand Up @@ -93,7 +100,7 @@ int main(int argc, char **argv)

printf("%-23s %7d %7d %-15s %-16s %-16s %-16s %-25s %-16llx %s\n",
timestamp, buf.pid, buf.tgid, get_task_state(buf.state), getusername(buf.euid), buf.comm, buf.exe_file,
sysent0[buf.syscall_nr].name, buf.syscall_args[0], buf.filename[0] ? buf.filename : ""
safe_syscall_name(buf.syscall_nr), buf.syscall_args[0], buf.filename[0] ? buf.filename : ""
); //
}

Expand Down