tequilaOS/platform_external_selinux
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libsepol/cil: Destroy cil_tree_node stacks when finished resolving AST

Browse source 
CIL uses separate cil_tree_node stacks for optionals and blocks to
check for statements not allowed in optionals or blocks and to know
which optional to disable when necessary. But these stacks were not
being destroyed when exiting cil_resolve_ast(). This is not a problem
normally because the stacks will be empty, but this is not the case
when exiting with an error.

Destroy both tree node stacks when exiting to ensure that they are
empty.

Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
This commit is contained in:
James Carter 2017-02-08 10:58:04 -05:00
parent c9adfe2d26
commit 9edcf28a04
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libsepol/cil/src/cil_resolve_ast.c
View file

@ -3778,6 +3778,16 @@ exit:
return rc;
}
static void cil_destroy_tree_node_stack(struct cil_tree_node *curr)
{
struct cil_tree_node *next;
while (curr != NULL) {
next = curr->cl_head;
free(curr);
curr = next;
}
}
int cil_resolve_ast(struct cil_db *db, struct cil_tree_node *current)
{
int rc = SEPOL_ERR;
@ -3904,16 +3914,12 @@ int cil_resolve_ast(struct cil_db *db, struct cil_tree_node *current)
/* reset the arguments */
changed = 0;
while (extra_args.optstack != NULL) {
struct cil_tree_node *curr = extra_args.optstack;
struct cil_tree_node *next = curr->cl_head;
free(curr);
extra_args.optstack = next;
cil_destroy_tree_node_stack(extra_args.optstack);
extra_args.optstack = NULL;
}
while (extra_args.blockstack!= NULL) {
struct cil_tree_node *curr = extra_args.blockstack;
struct cil_tree_node *next = curr->cl_head;
free(curr);
extra_args.blockstack= next;
cil_destroy_tree_node_stack(extra_args.blockstack);
extra_args.blockstack = NULL;
}
}
@ -3924,6 +3930,8 @@ int cil_resolve_ast(struct cil_db *db, struct cil_tree_node *current)
rc = SEPOL_OK;
exit:
cil_destroy_tree_node_stack(extra_args.optstack);
cil_destroy_tree_node_stack(extra_args.blockstack);
__cil_ordered_lists_destroy(&extra_args.sidorder_lists);
__cil_ordered_lists_destroy(&extra_args.classorder_lists);
__cil_ordered_lists_destroy(&extra_args.catorder_lists);