summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorDavidlohr Bueso <dave@gnu.org>2011-01-21 12:28:04 -0300
committerJames Morris <jmorris@namei.org>2011-01-24 11:35:47 +1100
commit3ac285ff23cd6e1bc402b6db836521bce006eb89 (patch)
tree449a7788ba52f3ac0cb7a5ae6a467934163745c2 /security
parente5cce6c13c25d9ac56955a3ae2fd562719848172 (diff)
downloadlinux-3ac285ff23cd6e1bc402b6db836521bce006eb89.tar.gz
linux-3ac285ff23cd6e1bc402b6db836521bce006eb89.tar.bz2
linux-3ac285ff23cd6e1bc402b6db836521bce006eb89.zip
selinux: return -ENOMEM when memory allocation fails
Return -ENOMEM when memory allocation fails in cond_init_bool_indexes, correctly propagating error code to caller. Signed-off-by: Davidlohr Bueso <dave@gnu.org> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-rw-r--r--security/selinux/ss/conditional.c2
-rw-r--r--security/selinux/ss/policydb.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index c3f845cbcd48..a53373207fb4 100644
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -178,7 +178,7 @@ int cond_init_bool_indexes(struct policydb *p)
p->bool_val_to_struct = (struct cond_bool_datum **)
kmalloc(p->p_bools.nprim * sizeof(struct cond_bool_datum *), GFP_KERNEL);
if (!p->bool_val_to_struct)
- return -1;
+ return -ENOMEM;
return 0;
}
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index be9de3872837..57363562f0f8 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -501,8 +501,8 @@ static int policydb_index(struct policydb *p)
if (rc)
goto out;
- rc = -ENOMEM;
- if (cond_init_bool_indexes(p))
+ rc = cond_init_bool_indexes(p);
+ if (rc)
goto out;
for (i = 0; i < SYM_NUM; i++) {