RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2024-12-26 16:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkpolicy: Fix errors found by coverity

Browse Source 
Couple of memory leaks and a couple of dead code spots.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Dan Walsh <dwalsh@redhat.com>
This commit is contained in:
Dan Walsh 2012-11-29 08:53:33 -05:00 committed by Eric Paris
parent c89deab09a
commit c27a54775d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
checkpolicy/policy_define.c
View File

@ -2777,6 +2777,7 @@ int define_constraint(constraint_expr_t * expr)
} }
if (!node->expr) { if (!node->expr) {
yyerror("out of memory"); yyerror("out of memory");
free(node);
return -1; return -1;
} }
node->permissions = 0; node->permissions = 0;
@ -3068,13 +3069,11 @@ uintptr_t define_cexpr(uint32_t expr_type, uintptr_t arg1, uintptr_t arg2)
ebitmap_destroy(&negset); ebitmap_destroy(&negset);
return (uintptr_t) expr; return (uintptr_t) expr;
default: default:
yyerror("invalid constraint expression"); break;
constraint_expr_destroy(expr);
return 0;
} }
yyerror("invalid constraint expression"); yyerror("invalid constraint expression");
free(expr); constraint_expr_destroy(expr);
return 0; return 0;
} }
@ -3281,6 +3280,7 @@ cond_expr_t *define_cond_expr(uint32_t expr_type, void *arg1, void *arg2)
return expr; return expr;
default: default:
yyerror("illegal conditional expression"); yyerror("illegal conditional expression");
free(expr);
return NULL; return NULL;
} }
} }
@ -4627,7 +4627,10 @@ int define_range_trans(int class_specified)
goto out; goto out;
} }
ebitmap_set_bit(&rule->tclasses, cladatum->s.value - 1, TRUE); if (ebitmap_set_bit(&rule->tclasses, cladatum->s.value - 1, TRUE)) {
yyerror("out of memory");
goto out;
}
} }
id = (char *)queue_remove(id_queue); id = (char *)queue_remove(id_queue);

5
checkpolicy/test/dismod.c
View File

@ -844,7 +844,10 @@ int main(int argc, char **argv)
/* read the binary policy */ /* read the binary policy */
fprintf(out_fp, "Reading policy...\n"); fprintf(out_fp, "Reading policy...\n");
policydb_init(&policydb); if (policydb_init(&policydb)) {
fprintf(stderr, "%s: Out of memory!\n", __FUNCTION__);
exit(1);
}
if (read_policy(argv[1], &policydb)) { if (read_policy(argv[1], &policydb)) {
fprintf(stderr, fprintf(stderr,
"%s: error(s) encountered while loading policy\n", "%s: error(s) encountered while loading policy\n",