diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-10-27 12:53:03 -0700 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-10-27 12:53:03 -0700 |
| commit | 04290949b3daef35d6279dcc05f01b549ac1772b (patch) | |
| tree | d34203b71660b9b4f7676f5bae7e0b9838ff161f /security/selinux/ss/policydb.c | |
| parent | d6d3f5bc68be3c4ab84e6f1f9db92291da671504 (diff) | |
| parent | 72ab373a5688a78cbdaf3bf96012e597d5399bb7 (diff) | |
| download | op-kernel-dev-04290949b3daef35d6279dcc05f01b549ac1772b.zip op-kernel-dev-04290949b3daef35d6279dcc05f01b549ac1772b.tar.gz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'security/selinux/ss/policydb.c')
| -rw-r--r-- | security/selinux/ss/policydb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index 0a75832..8e6262d 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; |
