From: Dan Carpenter <error27@gmail.com>
Date: Sat, 12 Jun 2010 18:55:01 +0000 (+0200)
Subject: selinux: fix error codes in cond_policydb_init()
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=38184c522249dc377366d4edc41dc500c2c3bb9e;p=openwrt%2Fstaging%2Fblogic.git

selinux: fix error codes in cond_policydb_init()

It's better to propagate the error code from avtab_init() instead of
returning -1 (-EPERM).  It turns out that avtab_init() never fails so
this patch doesn't change how the code runs but it's still a clean up.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by:  Stephen D. Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
---

diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index a2b3b298e604..0389263b99ce 100644
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -117,10 +117,14 @@ int evaluate_cond_node(struct policydb *p, struct cond_node *node)
 
 int cond_policydb_init(struct policydb *p)
 {
+	int rc;
+
 	p->bool_val_to_struct = NULL;
 	p->cond_list = NULL;
-	if (avtab_init(&p->te_cond_avtab))
-		return -1;
+
+	rc = avtab_init(&p->te_cond_avtab);
+	if (rc)
+		return rc;
 
 	return 0;
 }