summaryrefslogtreecommitdiffstats
path: root/security/selinux/ss/policydb.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-10-24 09:19:36 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-10-24 09:19:36 +0100
commit47c564e10f219f867bdb49225972749a43485a47 (patch)
tree5e119e0f2e011f422d880d88d1adb2142e508bfc /security/selinux/ss/policydb.c
parentc9c2009a4e915db17f32701d1f0535b400e61b58 (diff)
parentba9e358fd04190a59e605c2963a15e014139a707 (diff)
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'security/selinux/ss/policydb.c')
-rw-r--r--security/selinux/ss/policydb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 0a758323a9c..8e6262d12aa 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -650,8 +650,10 @@ void policydb_destroy(struct policydb *p)
}
if (lrt) kfree(lrt);
- for (i = 0; i < p->p_types.nprim; i++)
- ebitmap_destroy(&p->type_attr_map[i]);
+ if (p->type_attr_map) {
+ for (i = 0; i < p->p_types.nprim; i++)
+ ebitmap_destroy(&p->type_attr_map[i]);
+ }
kfree(p->type_attr_map);
return;