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 ../linux-2.6
[pandora-kernel.git]
/
security
/
selinux
/
ss
/
policydb.c
diff --git
a/security/selinux/ss/policydb.c
b/security/selinux/ss/policydb.c
index
0ac311d
..
f03960e
100644
(file)
--- a/
security/selinux/ss/policydb.c
+++ b/
security/selinux/ss/policydb.c
@@
-103,7
+103,7
@@
static struct policydb_compat_info *policydb_lookup_compat(int version)
int i;
struct policydb_compat_info *info = NULL;
int i;
struct policydb_compat_info *info = NULL;
- for (i = 0; i <
sizeof(policydb_compat)/sizeof(*info
); i++) {
+ for (i = 0; i <
ARRAY_SIZE(policydb_compat
); i++) {
if (policydb_compat[i].version == version) {
info = &policydb_compat[i];
break;
if (policydb_compat[i].version == version) {
info = &policydb_compat[i];
break;
@@
-644,10
+644,18
@@
void policydb_destroy(struct policydb *p)
kfree(lra);
for (rt = p->range_tr; rt; rt = rt -> next) {
kfree(lra);
for (rt = p->range_tr; rt; rt = rt -> next) {
- kfree(lrt);
+ if (lrt) {
+ ebitmap_destroy(&lrt->range.level[0].cat);
+ ebitmap_destroy(&lrt->range.level[1].cat);
+ kfree(lrt);
+ }
lrt = rt;
}
lrt = rt;
}
- kfree(lrt);
+ if (lrt) {
+ ebitmap_destroy(&lrt->range.level[0].cat);
+ ebitmap_destroy(&lrt->range.level[1].cat);
+ kfree(lrt);
+ }
if (p->type_attr_map) {
for (i = 0; i < p->p_types.nprim; i++)
if (p->type_attr_map) {
for (i = 0; i < p->p_types.nprim; i++)