Commit 34a2dab4 authored by Ondrej Mosnacek's avatar Ondrej Mosnacek Committed by Paul Moore

selinux: clean up error path in policydb_init()

Commit e0ac568d ("selinux: reduce the use of hard-coded hash sizes")
moved symtab initialization out of policydb_init(), but left the cleanup
of symtabs from the error path. This patch fixes the oversight.
Suggested-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Acked-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent e3e0b582
...@@ -463,36 +463,28 @@ static int rangetr_cmp(struct hashtab *h, const void *k1, const void *k2) ...@@ -463,36 +463,28 @@ static int rangetr_cmp(struct hashtab *h, const void *k1, const void *k2)
*/ */
static int policydb_init(struct policydb *p) static int policydb_init(struct policydb *p)
{ {
int i, rc; int rc;
memset(p, 0, sizeof(*p)); memset(p, 0, sizeof(*p));
rc = avtab_init(&p->te_avtab); rc = avtab_init(&p->te_avtab);
if (rc) if (rc)
goto out; return rc;
rc = cond_policydb_init(p); rc = cond_policydb_init(p);
if (rc) if (rc)
goto out; return rc;
p->filename_trans = hashtab_create(filenametr_hash, filenametr_cmp, p->filename_trans = hashtab_create(filenametr_hash, filenametr_cmp,
(1 << 11)); (1 << 11));
if (!p->filename_trans) { if (!p->filename_trans)
rc = -ENOMEM; return -ENOMEM;
goto out;
}
ebitmap_init(&p->filename_trans_ttypes); ebitmap_init(&p->filename_trans_ttypes);
ebitmap_init(&p->policycaps); ebitmap_init(&p->policycaps);
ebitmap_init(&p->permissive_map); ebitmap_init(&p->permissive_map);
return 0; return 0;
out:
for (i = 0; i < SYM_NUM; i++) {
hashtab_map(p->symtab[i].table, destroy_f[i], NULL);
hashtab_destroy(p->symtab[i].table);
}
return rc;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment