Skip to content

fix(net-filter): abort rule loading on invalid config #147

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

Closed
yuKing123-king wants to merge 2 commits into from
Closed

fix(net-filter): abort rule loading on invalid config #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a02b0c3
fix(net-filter): abort rule loading on invalid config
Sep 14, 2026
acf390a
revert(net-filter): restore previous bpf submodule revision
Sep 16, 2026
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 bpf
Open in desktop
Submodule bpf updated 3 files
+2 −0 filter/net-filter.bpf.c
+4 −7 observe/mountsnoop.bpf.c
+7 −21 observe/net-traffic.bpf.c
24 changes: 21 additions & 3 deletions filter/net-filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,27 +341,45 @@ bool NetFilter::load_rules(const char *rule_file)
char *line = NULL;
size_t len;
ssize_t read;
unsigned int first_key = key_cnt;

auto rollback_loaded_rules = [&]() {
for (unsigned int key = first_key; key < key_cnt; key++)
{
del_rule(key);
}
key_cnt = first_key;
};
while ((read = getline(&line, &len, fp)) != -1)
{
Rule rule;

if (line[0] == '#' || line[0] == '\n')
while (*line == ' ' || *line == '\t')
{
line++;
}
if (*line == '#' || *line == '\n' || *line == '\0')
{
continue;
}

if (!parse_rule(line, rule))
{
continue;
pr_error("syntax error in config file\n");
rollback_loaded_rules();
free(line);
fclose(fp);
return false;
}

int key;
key = add_rule(rule);

if (key < 0)
{
printf("syntax pr_error in config file\n");
pr_error("failed to add rule from config file\n");
rollback_loaded_rules();
free(line);
fclose(fp);
return false;
}
Expand Down
Loading