selinux: clean up error path in policydb_init() (34a2dab4) · Commits · 戴 / test

Commit ("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:

Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by:

Ondrej Mosnacek <omosnace@redhat.com> Acked-by:

Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by:

Paul Moore <paul@paul-moore.com>

security/selinux/ss/policydb.c

+5 −13

Original line number	Diff line number	Diff line
		@@ -463,36 +463,28 @@ static int rangetr_cmp(struct hashtab h, const void k1, const void *k2)
		*/
		static int policydb_init(struct policydb *p)
		{
		int i, rc;
		int rc;

		memset(p, 0, sizeof(*p));

		rc = avtab_init(&p->te_avtab);
		if (rc)
		goto out;
		return rc;

		rc = cond_policydb_init(p);
		if (rc)
		goto out;
		return rc;

		p->filename_trans = hashtab_create(filenametr_hash, filenametr_cmp,
		(1 << 11));
		if (!p->filename_trans) {
		rc = -ENOMEM;
		goto out;
		}
		if (!p->filename_trans)
		return -ENOMEM;

		ebitmap_init(&p->filename_trans_ttypes);
		ebitmap_init(&p->policycaps);
		ebitmap_init(&p->permissive_map);

		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;
		}

		/*

Admin message