diff options
| author | Stephen Smalley <sds@tycho.nsa.gov> | 2005-10-23 12:57:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-23 16:38:38 -0700 |
| commit | 282c1f5eba150d0b156ffa9e6b064f1d92f8315f (patch) | |
| tree | 1b4446dc0a2651a340be0c0485c8e053cdb27407 | |
| parent | 8766ce41018a0cb80fbe0ce7dbf747f357c752da (diff) | |
| download | op-kernel-dev-282c1f5eba150d0b156ffa9e6b064f1d92f8315f.zip op-kernel-dev-282c1f5eba150d0b156ffa9e6b064f1d92f8315f.tar.gz | |
[PATCH] selinux: Fix NULL deref in policydb_destroy
This patch fixes a possible NULL dereference in policydb_destroy, where
p->type_attr_map can be NULL if policydb_destroy is called to clean up a
partially loaded policy upon an error during policy load. Please apply.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -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; |
