Merge ../scsi-rc-fixes-2.6

1 files changed, 2 insertions, 0 deletions

diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index b18895302555..ba48961f9d05 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -618,6 +618,7 @@ void policydb_destroy(struct policydb *p)
                         c = c->next;
                         ocontext_destroy(ctmp,i);
                 }
+                p->ocontexts[i] = NULL;
         }
 
         g = p->genfs;
@@ -633,6 +634,7 @@ void policydb_destroy(struct policydb *p)
                 g = g->next;
                 kfree(gtmp);
         }
+        p->genfs = NULL;
 
         cond_policydb_destroy(p);