Commit 06c2efe2 authored by Ondrej Mosnacek's avatar Ondrej Mosnacek Committed by Paul Moore
Browse files

selinux: simplify evaluate_cond_node() 



It never fails, so it can just return void.

Signed-off-by: default avatarOndrej Mosnacek <omosnace@redhat.com>
Reviewed-by: default avatarStephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent e9c38f9f

security/selinux/ss/conditional.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

security/selinux/ss/conditional.h

+1 −1
Original line number Diff line number Diff line
@@ -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_ */

security/selinux/ss/services.c

+4 −10
Original line number Diff line number Diff line
@@ -2956,11 +2956,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;
@@ -3013,11 +3010,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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE