Skip to content

fix(lsock): handle initialization failures and cleanup trace resources #152

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

Open
yuKing123-king wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(lsock): handle initialization failures and cleanup trace resources #152

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
18 changes: 13 additions & 5 deletions observe/lsock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1062,7 +1062,7 @@ int main(int argc, char **argv)
{
int iter_fd;
ssize_t rd_sz;
CircleBuf *cb;
CircleBuf *cb = nullptr;
u32 key = 0;

rule_init();
Expand All @@ -1072,9 +1072,16 @@ int main(int argc, char **argv)
DEBUG(0, "BpfData header size: %lu\n", sizeof(BpfData));

register_signal();
cb = new CircleBuf(CIRCLE_BUF_SIZE);
memset(cb->buf(), 0, CIRCLE_BUF_SIZE);

try
{
cb = new CircleBuf(CIRCLE_BUF_SIZE);
memset(cb->buf(), 0, CIRCLE_BUF_SIZE);
}
catch (const std::exception &e)
{
pr_error("lsock: %s\n", e.what());
goto err_out_before_trace;
}
trace.start();
trace.async_follow();

Expand Down Expand Up @@ -1141,8 +1148,9 @@ int main(int argc, char **argv)
lsock_bpf::destroy(obj); // Clean up BPF object
delete cb;
return 0;

err_out:
trace.stop();
err_out_before_trace:
if (obj)
{
lsock_bpf::detach(obj); // Detach BPF program
Expand Down
Loading