leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selinux: avtab_init() and cond_policydb_init() return void

Browse Source 
The avtab_init() and cond_policydb_init() functions always return
zero so mark them as returning void and update the callers not to
check for a return value.

Suggested-by: Stephen Smalley <stephen.smalley.work@gmail.com>
Reviewed-by: Ondrej Mosnacek <omosnace@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
This commit is contained in:
Paul Moore 2020-03-05 14:55:43 -05:00
parent 34a2dab488
commit 5e729e111e
5 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
security/selinux/ss/avtab.c
View File

@ -299,12 +299,11 @@ void avtab_destroy(struct avtab *h)
h->mask = 0; h->mask = 0;
} }
int avtab_init(struct avtab *h) void avtab_init(struct avtab *h)
{ {
kvfree(h->htable); kvfree(h->htable);
h->htable = NULL; h->htable = NULL;
h->nel = 0; h->nel = 0;
return 0;
} }
int avtab_alloc(struct avtab *h, u32 nrules) int avtab_alloc(struct avtab *h, u32 nrules)

2
security/selinux/ss/avtab.h
View File

@ -87,7 +87,7 @@ struct avtab {
u32 mask; /* mask to compute hash func */ u32 mask; /* mask to compute hash func */
}; };
int avtab_init(struct avtab *); void avtab_init(struct avtab *h);
int avtab_alloc(struct avtab *, u32); int avtab_alloc(struct avtab *, u32);
struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *k); struct avtab_datum *avtab_search(struct avtab *h, struct avtab_key *k);
void avtab_destroy(struct avtab *h); void avtab_destroy(struct avtab *h);

10
security/selinux/ss/conditional.c
View File

@ -125,19 +125,13 @@ void evaluate_cond_nodes(struct policydb *p)
evaluate_cond_node(p, &p->cond_list[i]); evaluate_cond_node(p, &p->cond_list[i]);
} }
int cond_policydb_init(struct policydb *p) void cond_policydb_init(struct policydb *p)
{ {
int rc;
p->bool_val_to_struct = NULL; p->bool_val_to_struct = NULL;
p->cond_list = NULL; p->cond_list = NULL;
p->cond_list_len = 0; p->cond_list_len = 0;
rc = avtab_init(&p->te_cond_avtab); avtab_init(&p->te_cond_avtab);
if (rc)
return rc;
return 0;
} }
static void cond_node_destroy(struct cond_node *node) static void cond_node_destroy(struct cond_node *node)

2
security/selinux/ss/conditional.h
View File

@ -61,7 +61,7 @@ struct cond_node {
struct cond_av_list false_list; struct cond_av_list false_list;
}; };
int cond_policydb_init(struct policydb *p); void cond_policydb_init(struct policydb *p);
void cond_policydb_destroy(struct policydb *p); void cond_policydb_destroy(struct policydb *p);
int cond_init_bool_indexes(struct policydb *p); int cond_init_bool_indexes(struct policydb *p);

11
security/selinux/ss/policydb.c
View File

@ -463,17 +463,10 @@ 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 rc;
memset(p, 0, sizeof(*p)); memset(p, 0, sizeof(*p));
rc = avtab_init(&p->te_avtab); avtab_init(&p->te_avtab);
if (rc) cond_policydb_init(p);
return rc;
rc = cond_policydb_init(p);
if (rc)
return rc;
p->filename_trans = hashtab_create(filenametr_hash, filenametr_cmp, p->filename_trans = hashtab_create(filenametr_hash, filenametr_cmp,
(1 << 11)); (1 << 11));