mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix to stop leaking the dfa ruleset. On large policies containing lots of

Browse source 
hats this will result in a marked improvement on memory usage.
This commit is contained in:
John Johansen 2008-06-08 08:56:37 +00:00
parent aa0b2030c7
commit b2f4863231
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
parser/libapparmor_re/regexp.y
View file

@ -1684,7 +1684,7 @@ extern "C" int aare_add_rule_vec(aare_ruleset_t *rules, int deny,
} else {
//fprintf(stderr, "Adding deny ai %d mask 0x%x audit 0x%x\n", ai, mask, audit & mask);
deny_flags[ai][n] = new DenyMatchFlag(mask, audit&mask);
flag = deny_flags[ai][n];
flag = deny_flags[ai][n]->dup();
}
} else if (mask & AA_EXEC_BITS) {
uint32_t eperm = 0;
@ -1702,14 +1702,14 @@ extern "C" int aare_add_rule_vec(aare_ruleset_t *rules, int deny,
flag = exact_match_flags[ai][index]->dup();
} else {
exact_match_flags[ai][index] = new ExactMatchFlag(eperm, audit&mask);
flag = exact_match_flags[ai][index];
flag = exact_match_flags[ai][index]->dup();
}
} else {
if (exec_match_flags[ai][index]) {
flag = exec_match_flags[ai][index]->dup();
} else {
exec_match_flags[ai][index] = new MatchFlag(eperm, audit&mask);
flag = exec_match_flags[ai][index];
flag = exec_match_flags[ai][index]->dup();
}
}
} else {
@ -1717,7 +1717,7 @@ extern "C" int aare_add_rule_vec(aare_ruleset_t *rules, int deny,
flag = match_flags[ai][n]->dup();
} else {
match_flags[ai][n] = new MatchFlag(mask, audit&mask);
flag = match_flags[ai][n];
flag = match_flags[ai][n]->dup();
}
}
if (accept)

4
parser/parser_regex.c
View file

@ -602,7 +602,9 @@ int process_regex(struct codomain *cod)
if (regex_type == AARE_DFA && cod->dfarule_count > 0) {
cod->dfa = aare_create_dfa(cod->dfarules, 0, &cod->dfa_size);
if (!cod->dfa)
aare_delete_ruleset(cod->dfarules);
cod->dfarules = NULL;
if (!cod->dfa)
goto out;
/*
if (cod->dfa_size == 0) {