aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-06-12 20:55:01 +0200
committerJames Morris <jmorris@namei.org>2010-08-02 15:35:03 +1000
commit38184c522249dc377366d4edc41dc500c2c3bb9e (patch)
tree10c87bf5fdaea233a7842a79f04459792e1b5ba1 /security
parentfc5c126e4733e6fb3080d3d822ca63226e74fc84 (diff)
downloadmrst-s0i3-test-38184c522249dc377366d4edc41dc500c2c3bb9e.tar.gz
mrst-s0i3-test-38184c522249dc377366d4edc41dc500c2c3bb9e.tar.xz
mrst-s0i3-test-38184c522249dc377366d4edc41dc500c2c3bb9e.zip
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>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/ss/conditional.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index a2b3b298e60..0389263b99c 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;
}