mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 01:57:43 +00:00
Code Issues Releases Wiki Activity

parser: drop unused hash minimization remnants

Browse Source 
Hash minimization was removed in
  f0b154528 Fix dfa minimization

however some remnants of minimization remained. A comment and the use
of the hash but only as a 0 value. Drop this dead code and comment.

Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
John Johansen 2024-05-09 19:48:37 -07:00
parent 072acc61a3
commit 5ff00bba3a
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
parser/libapparmor_re/hfa.cc
View File

@ -652,35 +652,26 @@ typedef pair<uint64_t,uint64_t> uint128_t;
/* minimize the number of dfa states */ /* minimize the number of dfa states */
void DFA::minimize(optflags const &opts) void DFA::minimize(optflags const &opts)
{ {
map<pair<uint128_t, size_t>, Partition *> perm_map; map<uint128_t, Partition *> perm_map;
list<Partition *> partitions; list<Partition *> partitions;
/* Set up the initial partitions /* Set up the initial partitions
* minimum of - 1 non accepting, and 1 accepting * minimum of - 1 non accepting, and 1 accepting
* if trans hashing is used the accepting and non-accepting partitions
* can be further split based on the number and type of transitions
* a state makes.
* If permission hashing is enabled the accepting partitions can
* be further divided by permissions. This can result in not
* obtaining a truly minimized dfa but comes close, and can speedup
* minimization.
*/ */
int accept_count = 0; int accept_count = 0;
int final_accept = 0; int final_accept = 0;
for (Partition::iterator i = states.begin(); i != states.end(); i++) { for (Partition::iterator i = states.begin(); i != states.end(); i++) {
size_t hash = 0; uint128_t group;
uint128_t permtype; group.first = ((uint64_t) (PACK_AUDIT_CTL((*i)->perms.audit, (*i)->perms.quiet & (*i)->perms.deny)) << 32);
permtype.first = ((uint64_t) (PACK_AUDIT_CTL((*i)->perms.audit, (*i)->perms.quiet & (*i)->perms.deny)) << 32); group.second = (uint64_t) (*i)->perms.allow | ((uint64_t) (*i)->perms.prompt << 32);
permtype.second = (uint64_t) (*i)->perms.allow | ((uint64_t) (*i)->perms.prompt << 32); map<uint128_t, Partition *>::iterator p = perm_map.find(group);
pair<uint128_t, size_t> group = make_pair(permtype, hash);
map<pair<uint128_t, size_t>, Partition *>::iterator p = perm_map.find(group);
if (p == perm_map.end()) { if (p == perm_map.end()) {
Partition *part = new Partition(); Partition *part = new Partition();
part->push_back(*i); part->push_back(*i);
perm_map.insert(make_pair(group, part)); perm_map.insert(make_pair(group, part));
partitions.push_back(part); partitions.push_back(part);
(*i)->partition = part; (*i)->partition = part;
if (permtype.first || permtype.second) if (group.first || group.second)
accept_count++; accept_count++;
} else { } else {
(*i)->partition = p->second; (*i)->partition = p->second;