git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
security
/
selinux
/
ss
/
conditional.c
diff --git
a/security/selinux/ss/conditional.c
b/security/selinux/ss/conditional.c
index
c3f845c
..
a533732
100644
(file)
--- 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;
}