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

Add a new class hashedNodeSet.

Browse source 
It is the functional equivalent of ProtoState.  We do this to provide a
new level of abstraction that ProtoState can leverage, when the node types
are split.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Kees Cook <kees@ubuntu.com>
This commit is contained in:
John Johansen 2011-12-15 05:11:09 -08:00
parent 35b7ee91eb
commit bd10235397
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
parser/libapparmor_re/hfa.cc
View file

@ -61,6 +61,12 @@ State *DFA::find_target_state(NodeMap &nodemap, list<State *> &work_queue,
{ {
State *target; State *target;
pair<set<hashedNodeSet>::iterator,bool> uniq = uniq_nodes.insert(hashedNodeSet(nodes));
if (uniq.second == false) {
delete(nodes);
nodes = uniq.first->nodes;
}
ProtoState index(nodes); ProtoState index(nodes);
map<ProtoState, State *>::iterator x = nodemap.find(index); map<ProtoState, State *>::iterator x = nodemap.find(index);
@ -74,7 +80,6 @@ State *DFA::find_target_state(NodeMap &nodemap, list<State *> &work_queue,
} else { } else {
/* set of nodes already has a mapping so free this one */ /* set of nodes already has a mapping so free this one */
stats.duplicates++; stats.duplicates++;
delete(nodes);
target = x->second; target = x->second;
} }
@ -206,8 +211,9 @@ DFA::DFA(Node *root, dfaflags_t flags): root(root)
if (flags & DFA_DUMP_NODE_TO_DFA) if (flags & DFA_DUMP_NODE_TO_DFA)
dump_node_to_dfa(); dump_node_to_dfa();
for (NodeMap::iterator i = nodemap.begin(); i != nodemap.end(); i++) for (set<hashedNodeSet>::iterator i = uniq_nodes.begin(); i != uniq_nodes.end(); i++)
delete i->first.nodes; delete i->nodes;
uniq_nodes.clear();
nodemap.clear(); nodemap.clear();
if (flags & (DFA_DUMP_STATS)) if (flags & (DFA_DUMP_STATS))

27
parser/libapparmor_re/hfa.h
View file

@ -40,19 +40,19 @@ typedef list<State *> Partition;
uint32_t accept_perms(NodeSet *state, uint32_t *audit_ctl, int *error); uint32_t accept_perms(NodeSet *state, uint32_t *audit_ctl, int *error);
/* /*
* ProtoState - NodeSet and ancillery information used to create a state * hashedNodes - for efficient set comparison
*/ */
class ProtoState { class hashedNodeSet {
public: public:
unsigned long hash; unsigned long hash;
NodeSet *nodes; NodeSet *nodes;
ProtoState(NodeSet *n): nodes(n) hashedNodeSet(NodeSet *n): nodes(n)
{ {
hash = hash_NodeSet(n); hash = hash_NodeSet(n);
} }
bool operator<(ProtoState const &rhs)const bool operator<(hashedNodeSet const &rhs)const
{ {
if (hash == rhs.hash) { if (hash == rhs.hash) {
if (nodes->size() == rhs.nodes->size()) if (nodes->size() == rhs.nodes->size())
@ -65,6 +65,21 @@ public:
} }
}; };
/*
* ProtoState - NodeSet and ancillery information used to create a state
*/
class ProtoState {
public:
NodeSet *nodes;
ProtoState(NodeSet *n): nodes(n) { };
bool operator<(ProtoState const &rhs)const
{
return nodes < rhs.nodes;
}
};
/* /*
* State - DFA individual state information * State - DFA individual state information
* label: a unique label to identify the state used for pretty printing * label: a unique label to identify the state used for pretty printing
@ -135,6 +150,10 @@ class DFA {
State *state, dfa_stats_t &stats); State *state, dfa_stats_t &stats);
State *find_target_state(NodeMap &nodemap, list<State *> &work_queue, State *find_target_state(NodeMap &nodemap, list<State *> &work_queue,
NodeSet *nodes, dfa_stats_t &stats); NodeSet *nodes, dfa_stats_t &stats);
/* temporary values used during computations */
set<hashedNodeSet> uniq_nodes;
public: public:
DFA(Node *root, dfaflags_t flags); DFA(Node *root, dfaflags_t flags);
virtual ~DFA(); virtual ~DFA();