| Message ID | 20200117085836.445797-2-omosnace@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | selinux: Assorted simplifications and cleanups | expand |
On 1/17/20 3:58 AM, Ondrej Mosnacek wrote: > It never fails, so it can just return void. > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> Reviewed-by: Stephen Smalley <sds@tycho.nsa.gov> > --- > security/selinux/ss/conditional.c | 3 +-- > security/selinux/ss/conditional.h | 2 +- > security/selinux/ss/services.c | 14 ++++---------- > 3 files changed, 6 insertions(+), 13 deletions(-) > > diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c > index 70c378ee1a2f..04593062008d 100644 > --- a/security/selinux/ss/conditional.c > +++ b/security/selinux/ss/conditional.c > @@ -85,7 +85,7 @@ static int cond_evaluate_expr(struct policydb *p, struct cond_expr *expr) > * list appropriately. If the result of the expression is undefined > * all of the rules are disabled for safety. > */ > -int evaluate_cond_node(struct policydb *p, struct cond_node *node) > +void evaluate_cond_node(struct policydb *p, struct cond_node *node) > { > int new_state; > struct cond_av_list *cur; > @@ -111,7 +111,6 @@ int evaluate_cond_node(struct policydb *p, struct cond_node *node) > cur->node->key.specified |= AVTAB_ENABLED; > } > } > - return 0; > } > > int cond_policydb_init(struct policydb *p) > diff --git a/security/selinux/ss/conditional.h b/security/selinux/ss/conditional.h > index ec846e45904c..d86ef286ca84 100644 > --- a/security/selinux/ss/conditional.h > +++ b/security/selinux/ss/conditional.h > @@ -75,6 +75,6 @@ void cond_compute_av(struct avtab *ctab, struct avtab_key *key, > struct av_decision *avd, struct extended_perms *xperms); > void cond_compute_xperms(struct avtab *ctab, struct avtab_key *key, > struct extended_perms_decision *xpermd); > -int evaluate_cond_node(struct policydb *p, struct cond_node *node); > +void evaluate_cond_node(struct policydb *p, struct cond_node *node); > > #endif /* _CONDITIONAL_H_ */ > diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c > index 216ce602a2b5..ff43a35bb874 100644 > --- a/security/selinux/ss/services.c > +++ b/security/selinux/ss/services.c > @@ -2958,11 +2958,8 @@ int security_set_bools(struct selinux_state *state, int len, int *values) > policydb->bool_val_to_struct[i]->state = 0; > } > > - for (cur = policydb->cond_list; cur; cur = cur->next) { > - rc = evaluate_cond_node(policydb, cur); > - if (rc) > - goto out; > - } > + for (cur = policydb->cond_list; cur; cur = cur->next) > + evaluate_cond_node(policydb, cur); > > seqno = ++state->ss->latest_granting; > rc = 0; > @@ -3015,11 +3012,8 @@ static int security_preserve_bools(struct selinux_state *state, > if (booldatum) > booldatum->state = bvalues[i]; > } > - for (cur = policydb->cond_list; cur; cur = cur->next) { > - rc = evaluate_cond_node(policydb, cur); > - if (rc) > - goto out; > - } > + for (cur = policydb->cond_list; cur; cur = cur->next) > + evaluate_cond_node(policydb, cur); > > out: > if (bnames) { >
On Fri, Jan 17, 2020 at 3:58 AM Ondrej Mosnacek <omosnace@redhat.com> wrote: > > It never fails, so it can just return void. > > Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> > --- > security/selinux/ss/conditional.c | 3 +-- > security/selinux/ss/conditional.h | 2 +- > security/selinux/ss/services.c | 14 ++++---------- > 3 files changed, 6 insertions(+), 13 deletions(-) Thanks, I've queued this into selinux/next, you'll see if after the merge window closes.
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c index 70c378ee1a2f..04593062008d 100644 --- a/security/selinux/ss/conditional.c +++ b/security/selinux/ss/conditional.c @@ -85,7 +85,7 @@ static int cond_evaluate_expr(struct policydb *p, struct cond_expr *expr) * list appropriately. If the result of the expression is undefined * all of the rules are disabled for safety. */ -int evaluate_cond_node(struct policydb *p, struct cond_node *node) +void evaluate_cond_node(struct policydb *p, struct cond_node *node) { int new_state; struct cond_av_list *cur; @@ -111,7 +111,6 @@ int evaluate_cond_node(struct policydb *p, struct cond_node *node) cur->node->key.specified |= AVTAB_ENABLED; } } - return 0; } int cond_policydb_init(struct policydb *p) diff --git a/security/selinux/ss/conditional.h b/security/selinux/ss/conditional.h index ec846e45904c..d86ef286ca84 100644 --- a/security/selinux/ss/conditional.h +++ b/security/selinux/ss/conditional.h @@ -75,6 +75,6 @@ void cond_compute_av(struct avtab *ctab, struct avtab_key *key, struct av_decision *avd, struct extended_perms *xperms); void cond_compute_xperms(struct avtab *ctab, struct avtab_key *key, struct extended_perms_decision *xpermd); -int evaluate_cond_node(struct policydb *p, struct cond_node *node); +void evaluate_cond_node(struct policydb *p, struct cond_node *node); #endif /* _CONDITIONAL_H_ */ diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 216ce602a2b5..ff43a35bb874 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c @@ -2958,11 +2958,8 @@ int security_set_bools(struct selinux_state *state, int len, int *values) policydb->bool_val_to_struct[i]->state = 0; } - for (cur = policydb->cond_list; cur; cur = cur->next) { - rc = evaluate_cond_node(policydb, cur); - if (rc) - goto out; - } + for (cur = policydb->cond_list; cur; cur = cur->next) + evaluate_cond_node(policydb, cur); seqno = ++state->ss->latest_granting; rc = 0; @@ -3015,11 +3012,8 @@ static int security_preserve_bools(struct selinux_state *state, if (booldatum) booldatum->state = bvalues[i]; } - for (cur = policydb->cond_list; cur; cur = cur->next) { - rc = evaluate_cond_node(policydb, cur); - if (rc) - goto out; - } + for (cur = policydb->cond_list; cur; cur = cur->next) + evaluate_cond_node(policydb, cur); out: if (bnames) {
It never fails, so it can just return void. Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com> --- security/selinux/ss/conditional.c | 3 +-- security/selinux/ss/conditional.h | 2 +- security/selinux/ss/services.c | 14 ++++---------- 3 files changed, 6 insertions(+), 13 deletions(-)