selinux: move user accesses in selinuxfs out of locked regions
[sfrench/cifs-2.6.git] / security / selinux / selinuxfs.c
index 00eed842c491c3585b68e7b23e2ee63885f02196..19e35dd695d7a4efda74b270a00ceb1e074ab7cc 100644 (file)
@@ -19,6 +19,7 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
+#include <linux/mount.h>
 #include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/string.h>
 #include "objsec.h"
 #include "conditional.h"
 
-unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE;
-
-static int __init checkreqprot_setup(char *str)
-{
-       unsigned long checkreqprot;
-       if (!kstrtoul(str, 0, &checkreqprot))
-               selinux_checkreqprot = checkreqprot ? 1 : 0;
-       return 1;
-}
-__setup("checkreqprot=", checkreqprot_setup);
-
-static DEFINE_MUTEX(sel_mutex);
-
-/* global data for booleans */
-static struct dentry *bool_dir;
-static int bool_num;
-static char **bool_pending_names;
-static int *bool_pending_values;
-
-/* global data for classes */
-static struct dentry *class_dir;
-static unsigned long last_class_ino;
-
-static char policy_opened;
-
-/* global data for policy capabilities */
-static struct dentry *policycap_dir;
-
 enum sel_inos {
        SEL_ROOT_INO = 2,
        SEL_LOAD,       /* load policy */
@@ -93,7 +66,51 @@ enum sel_inos {
        SEL_INO_NEXT,   /* The next inode number to use */
 };
 
-static unsigned long sel_last_ino = SEL_INO_NEXT - 1;
+struct selinux_fs_info {
+       struct dentry *bool_dir;
+       unsigned int bool_num;
+       char **bool_pending_names;
+       unsigned int *bool_pending_values;
+       struct dentry *class_dir;
+       unsigned long last_class_ino;
+       bool policy_opened;
+       struct dentry *policycap_dir;
+       struct mutex mutex;
+       unsigned long last_ino;
+       struct selinux_state *state;
+       struct super_block *sb;
+};
+
+static int selinux_fs_info_create(struct super_block *sb)
+{
+       struct selinux_fs_info *fsi;
+
+       fsi = kzalloc(sizeof(*fsi), GFP_KERNEL);
+       if (!fsi)
+               return -ENOMEM;
+
+       mutex_init(&fsi->mutex);
+       fsi->last_ino = SEL_INO_NEXT - 1;
+       fsi->state = &selinux_state;
+       fsi->sb = sb;
+       sb->s_fs_info = fsi;
+       return 0;
+}
+
+static void selinux_fs_info_free(struct super_block *sb)
+{
+       struct selinux_fs_info *fsi = sb->s_fs_info;
+       int i;
+
+       if (fsi) {
+               for (i = 0; i < fsi->bool_num; i++)
+                       kfree(fsi->bool_pending_names[i]);
+               kfree(fsi->bool_pending_names);
+               kfree(fsi->bool_pending_values);
+       }
+       kfree(sb->s_fs_info);
+       sb->s_fs_info = NULL;
+}
 
 #define SEL_INITCON_INO_OFFSET         0x01000000
 #define SEL_BOOL_INO_OFFSET            0x02000000
@@ -105,10 +122,12 @@ static unsigned long sel_last_ino = SEL_INO_NEXT - 1;
 static ssize_t sel_read_enforce(struct file *filp, char __user *buf,
                                size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(filp)->i_sb->s_fs_info;
        char tmpbuf[TMPBUFLEN];
        ssize_t length;
 
-       length = scnprintf(tmpbuf, TMPBUFLEN, "%d", selinux_enforcing);
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%d",
+                          enforcing_enabled(fsi->state));
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
@@ -117,9 +136,11 @@ static ssize_t sel_write_enforce(struct file *file, const char __user *buf,
                                 size_t count, loff_t *ppos)
 
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *page = NULL;
        ssize_t length;
-       int new_value;
+       int old_value, new_value;
 
        if (count >= PAGE_SIZE)
                return -ENOMEM;
@@ -138,23 +159,27 @@ static ssize_t sel_write_enforce(struct file *file, const char __user *buf,
 
        new_value = !!new_value;
 
-       if (new_value != selinux_enforcing) {
-               length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       old_value = enforcing_enabled(state);
+       if (new_value != old_value) {
+               length = avc_has_perm(&selinux_state,
+                                     current_sid(), SECINITSID_SECURITY,
                                      SECCLASS_SECURITY, SECURITY__SETENFORCE,
                                      NULL);
                if (length)
                        goto out;
                audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
-                       "enforcing=%d old_enforcing=%d auid=%u ses=%u",
-                       new_value, selinux_enforcing,
+                       "enforcing=%d old_enforcing=%d auid=%u ses=%u"
+                       " enabled=%d old-enabled=%d lsm=selinux res=1",
+                       new_value, old_value,
                        from_kuid(&init_user_ns, audit_get_loginuid(current)),
-                       audit_get_sessionid(current));
-               selinux_enforcing = new_value;
-               if (selinux_enforcing)
-                       avc_ss_reset(0);
-               selnl_notify_setenforce(selinux_enforcing);
-               selinux_status_update_setenforce(selinux_enforcing);
-               if (!selinux_enforcing)
+                       audit_get_sessionid(current),
+                       selinux_enabled, selinux_enabled);
+               enforcing_set(state, new_value);
+               if (new_value)
+                       avc_ss_reset(state->avc, 0);
+               selnl_notify_setenforce(new_value);
+               selinux_status_update_setenforce(state, new_value);
+               if (!new_value)
                        call_lsm_notifier(LSM_POLICY_CHANGE, NULL);
        }
        length = count;
@@ -175,11 +200,14 @@ static const struct file_operations sel_enforce_ops = {
 static ssize_t sel_read_handle_unknown(struct file *filp, char __user *buf,
                                        size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(filp)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char tmpbuf[TMPBUFLEN];
        ssize_t length;
        ino_t ino = file_inode(filp)->i_ino;
        int handle_unknown = (ino == SEL_REJECT_UNKNOWN) ?
-               security_get_reject_unknown() : !security_get_allow_unknown();
+               security_get_reject_unknown(state) :
+               !security_get_allow_unknown(state);
 
        length = scnprintf(tmpbuf, TMPBUFLEN, "%d", handle_unknown);
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
@@ -192,7 +220,8 @@ static const struct file_operations sel_handle_unknown_ops = {
 
 static int sel_open_handle_status(struct inode *inode, struct file *filp)
 {
-       struct page    *status = selinux_kernel_status_page();
+       struct selinux_fs_info *fsi = file_inode(filp)->i_sb->s_fs_info;
+       struct page    *status = selinux_kernel_status_page(fsi->state);
 
        if (!status)
                return -ENOMEM;
@@ -248,9 +277,11 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf,
                                 size_t count, loff_t *ppos)
 
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
        char *page;
        ssize_t length;
        int new_value;
+       int enforcing;
 
        if (count >= PAGE_SIZE)
                return -ENOMEM;
@@ -268,13 +299,16 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf,
                goto out;
 
        if (new_value) {
-               length = selinux_disable();
+               enforcing = enforcing_enabled(fsi->state);
+               length = selinux_disable(fsi->state);
                if (length)
                        goto out;
                audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
-                       "selinux=0 auid=%u ses=%u",
+                       "enforcing=%d old_enforcing=%d auid=%u ses=%u"
+                       " enabled=%d old-enabled=%d lsm=selinux res=1",
+                       enforcing, enforcing,
                        from_kuid(&init_user_ns, audit_get_loginuid(current)),
-                       audit_get_sessionid(current));
+                       audit_get_sessionid(current), 0, 1);
        }
 
        length = count;
@@ -307,9 +341,9 @@ static const struct file_operations sel_policyvers_ops = {
 };
 
 /* declaration for sel_write_load */
-static int sel_make_bools(void);
-static int sel_make_classes(void);
-static int sel_make_policycap(void);
+static int sel_make_bools(struct selinux_fs_info *fsi);
+static int sel_make_classes(struct selinux_fs_info *fsi);
+static int sel_make_policycap(struct selinux_fs_info *fsi);
 
 /* declaration for sel_make_class_dirs */
 static struct dentry *sel_make_dir(struct dentry *dir, const char *name,
@@ -318,11 +352,12 @@ static struct dentry *sel_make_dir(struct dentry *dir, const char *name,
 static ssize_t sel_read_mls(struct file *filp, char __user *buf,
                                size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(filp)->i_sb->s_fs_info;
        char tmpbuf[TMPBUFLEN];
        ssize_t length;
 
        length = scnprintf(tmpbuf, TMPBUFLEN, "%d",
-                          security_mls_enabled());
+                          security_mls_enabled(fsi->state));
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
@@ -338,20 +373,23 @@ struct policy_load_memory {
 
 static int sel_open_policy(struct inode *inode, struct file *filp)
 {
+       struct selinux_fs_info *fsi = inode->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        struct policy_load_memory *plm = NULL;
        int rc;
 
        BUG_ON(filp->private_data);
 
-       mutex_lock(&sel_mutex);
+       mutex_lock(&fsi->mutex);
 
-       rc = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       rc = avc_has_perm(&selinux_state,
+                         current_sid(), SECINITSID_SECURITY,
                          SECCLASS_SECURITY, SECURITY__READ_POLICY, NULL);
        if (rc)
                goto err;
 
        rc = -EBUSY;
-       if (policy_opened)
+       if (fsi->policy_opened)
                goto err;
 
        rc = -ENOMEM;
@@ -359,25 +397,25 @@ static int sel_open_policy(struct inode *inode, struct file *filp)
        if (!plm)
                goto err;
 
-       if (i_size_read(inode) != security_policydb_len()) {
+       if (i_size_read(inode) != security_policydb_len(state)) {
                inode_lock(inode);
-               i_size_write(inode, security_policydb_len());
+               i_size_write(inode, security_policydb_len(state));
                inode_unlock(inode);
        }
 
-       rc = security_read_policy(&plm->data, &plm->len);
+       rc = security_read_policy(state, &plm->data, &plm->len);
        if (rc)
                goto err;
 
-       policy_opened = 1;
+       fsi->policy_opened = 1;
 
        filp->private_data = plm;
 
-       mutex_unlock(&sel_mutex);
+       mutex_unlock(&fsi->mutex);
 
        return 0;
 err:
-       mutex_unlock(&sel_mutex);
+       mutex_unlock(&fsi->mutex);
 
        if (plm)
                vfree(plm->data);
@@ -387,11 +425,12 @@ err:
 
 static int sel_release_policy(struct inode *inode, struct file *filp)
 {
+       struct selinux_fs_info *fsi = inode->i_sb->s_fs_info;
        struct policy_load_memory *plm = filp->private_data;
 
        BUG_ON(!plm);
 
-       policy_opened = 0;
+       fsi->policy_opened = 0;
 
        vfree(plm->data);
        kfree(plm);
@@ -405,20 +444,16 @@ static ssize_t sel_read_policy(struct file *filp, char __user *buf,
        struct policy_load_memory *plm = filp->private_data;
        int ret;
 
-       mutex_lock(&sel_mutex);
-
-       ret = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       ret = avc_has_perm(&selinux_state,
+                          current_sid(), SECINITSID_SECURITY,
                          SECCLASS_SECURITY, SECURITY__READ_POLICY, NULL);
        if (ret)
-               goto out;
+               return ret;
 
-       ret = simple_read_from_buffer(buf, count, ppos, plm->data, plm->len);
-out:
-       mutex_unlock(&sel_mutex);
-       return ret;
+       return simple_read_from_buffer(buf, count, ppos, plm->data, plm->len);
 }
 
-static int sel_mmap_policy_fault(struct vm_fault *vmf)
+static vm_fault_t sel_mmap_policy_fault(struct vm_fault *vmf)
 {
        struct policy_load_memory *plm = vmf->vma->vm_file->private_data;
        unsigned long offset;
@@ -468,16 +503,43 @@ static const struct file_operations sel_policy_ops = {
        .llseek         = generic_file_llseek,
 };
 
+static int sel_make_policy_nodes(struct selinux_fs_info *fsi)
+{
+       int ret;
+
+       ret = sel_make_bools(fsi);
+       if (ret) {
+               pr_err("SELinux: failed to load policy booleans\n");
+               return ret;
+       }
+
+       ret = sel_make_classes(fsi);
+       if (ret) {
+               pr_err("SELinux: failed to load policy classes\n");
+               return ret;
+       }
+
+       ret = sel_make_policycap(fsi);
+       if (ret) {
+               pr_err("SELinux: failed to load policy capabilities\n");
+               return ret;
+       }
+
+       return 0;
+}
+
 static ssize_t sel_write_load(struct file *file, const char __user *buf,
                              size_t count, loff_t *ppos)
 
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
        ssize_t length;
        void *data = NULL;
 
-       mutex_lock(&sel_mutex);
+       mutex_lock(&fsi->mutex);
 
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
                              SECCLASS_SECURITY, SECURITY__LOAD_POLICY, NULL);
        if (length)
                goto out;
@@ -500,39 +562,25 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
        if (copy_from_user(data, buf, count) != 0)
                goto out;
 
-       length = security_load_policy(data, count);
+       length = security_load_policy(fsi->state, data, count);
        if (length) {
                pr_warn_ratelimited("SELinux: failed to load policy\n");
                goto out;
        }
 
-       length = sel_make_bools();
-       if (length) {
-               pr_err("SELinux: failed to load policy booleans\n");
-               goto out1;
-       }
-
-       length = sel_make_classes();
-       if (length) {
-               pr_err("SELinux: failed to load policy classes\n");
-               goto out1;
-       }
-
-       length = sel_make_policycap();
-       if (length) {
-               pr_err("SELinux: failed to load policy capabilities\n");
+       length = sel_make_policy_nodes(fsi);
+       if (length)
                goto out1;
-       }
 
        length = count;
 
 out1:
        audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,
-               "policy loaded auid=%u ses=%u",
+               "auid=%u ses=%u lsm=selinux res=1",
                from_kuid(&init_user_ns, audit_get_loginuid(current)),
                audit_get_sessionid(current));
 out:
-       mutex_unlock(&sel_mutex);
+       mutex_unlock(&fsi->mutex);
        vfree(data);
        return length;
 }
@@ -544,20 +592,23 @@ static const struct file_operations sel_load_ops = {
 
 static ssize_t sel_write_context(struct file *file, char *buf, size_t size)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *canon = NULL;
        u32 sid, len;
        ssize_t length;
 
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
                              SECCLASS_SECURITY, SECURITY__CHECK_CONTEXT, NULL);
        if (length)
                goto out;
 
-       length = security_context_to_sid(buf, size, &sid, GFP_KERNEL);
+       length = security_context_to_sid(state, buf, size, &sid, GFP_KERNEL);
        if (length)
                goto out;
 
-       length = security_sid_to_context(sid, &canon, &len);
+       length = security_sid_to_context(state, sid, &canon, &len);
        if (length)
                goto out;
 
@@ -578,21 +629,24 @@ out:
 static ssize_t sel_read_checkreqprot(struct file *filp, char __user *buf,
                                     size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(filp)->i_sb->s_fs_info;
        char tmpbuf[TMPBUFLEN];
        ssize_t length;
 
-       length = scnprintf(tmpbuf, TMPBUFLEN, "%u", selinux_checkreqprot);
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%u", fsi->state->checkreqprot);
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
 static ssize_t sel_write_checkreqprot(struct file *file, const char __user *buf,
                                      size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
        char *page;
        ssize_t length;
        unsigned int new_value;
 
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
                              SECCLASS_SECURITY, SECURITY__SETCHECKREQPROT,
                              NULL);
        if (length)
@@ -613,7 +667,7 @@ static ssize_t sel_write_checkreqprot(struct file *file, const char __user *buf,
        if (sscanf(page, "%u", &new_value) != 1)
                goto out;
 
-       selinux_checkreqprot = new_value ? 1 : 0;
+       fsi->state->checkreqprot = new_value ? 1 : 0;
        length = count;
 out:
        kfree(page);
@@ -629,13 +683,16 @@ static ssize_t sel_write_validatetrans(struct file *file,
                                        const char __user *buf,
                                        size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *oldcon = NULL, *newcon = NULL, *taskcon = NULL;
        char *req = NULL;
        u32 osid, nsid, tsid;
        u16 tclass;
        int rc;
 
-       rc = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       rc = avc_has_perm(&selinux_state,
+                         current_sid(), SECINITSID_SECURITY,
                          SECCLASS_SECURITY, SECURITY__VALIDATE_TRANS, NULL);
        if (rc)
                goto out;
@@ -673,19 +730,19 @@ static ssize_t sel_write_validatetrans(struct file *file,
        if (sscanf(req, "%s %s %hu %s", oldcon, newcon, &tclass, taskcon) != 4)
                goto out;
 
-       rc = security_context_str_to_sid(oldcon, &osid, GFP_KERNEL);
+       rc = security_context_str_to_sid(state, oldcon, &osid, GFP_KERNEL);
        if (rc)
                goto out;
 
-       rc = security_context_str_to_sid(newcon, &nsid, GFP_KERNEL);
+       rc = security_context_str_to_sid(state, newcon, &nsid, GFP_KERNEL);
        if (rc)
                goto out;
 
-       rc = security_context_str_to_sid(taskcon, &tsid, GFP_KERNEL);
+       rc = security_context_str_to_sid(state, taskcon, &tsid, GFP_KERNEL);
        if (rc)
                goto out;
 
-       rc = security_validate_transition_user(osid, nsid, tsid, tclass);
+       rc = security_validate_transition_user(state, osid, nsid, tsid, tclass);
        if (!rc)
                rc = count;
 out:
@@ -755,13 +812,16 @@ static const struct file_operations transaction_ops = {
 
 static ssize_t sel_write_access(struct file *file, char *buf, size_t size)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *scon = NULL, *tcon = NULL;
        u32 ssid, tsid;
        u16 tclass;
        struct av_decision avd;
        ssize_t length;
 
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
                              SECCLASS_SECURITY, SECURITY__COMPUTE_AV, NULL);
        if (length)
                goto out;
@@ -780,15 +840,15 @@ static ssize_t sel_write_access(struct file *file, char *buf, size_t size)
        if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
                goto out;
 
-       length = security_context_str_to_sid(scon, &ssid, GFP_KERNEL);
+       length = security_context_str_to_sid(state, scon, &ssid, GFP_KERNEL);
        if (length)
                goto out;
 
-       length = security_context_str_to_sid(tcon, &tsid, GFP_KERNEL);
+       length = security_context_str_to_sid(state, tcon, &tsid, GFP_KERNEL);
        if (length)
                goto out;
 
-       security_compute_av_user(ssid, tsid, tclass, &avd);
+       security_compute_av_user(state, ssid, tsid, tclass, &avd);
 
        length = scnprintf(buf, SIMPLE_TRANSACTION_LIMIT,
                          "%x %x %x %x %u %x",
@@ -803,6 +863,8 @@ out:
 
 static ssize_t sel_write_create(struct file *file, char *buf, size_t size)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *scon = NULL, *tcon = NULL;
        char *namebuf = NULL, *objname = NULL;
        u32 ssid, tsid, newsid;
@@ -812,7 +874,8 @@ static ssize_t sel_write_create(struct file *file, char *buf, size_t size)
        u32 len;
        int nargs;
 
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
                              SECCLASS_SECURITY, SECURITY__COMPUTE_CREATE,
                              NULL);
        if (length)
@@ -868,20 +931,20 @@ static ssize_t sel_write_create(struct file *file, char *buf, size_t size)
                objname = namebuf;
        }
 
-       length = security_context_str_to_sid(scon, &ssid, GFP_KERNEL);
+       length = security_context_str_to_sid(state, scon, &ssid, GFP_KERNEL);
        if (length)
                goto out;
 
-       length = security_context_str_to_sid(tcon, &tsid, GFP_KERNEL);
+       length = security_context_str_to_sid(state, tcon, &tsid, GFP_KERNEL);
        if (length)
                goto out;
 
-       length = security_transition_sid_user(ssid, tsid, tclass,
+       length = security_transition_sid_user(state, ssid, tsid, tclass,
                                              objname, &newsid);
        if (length)
                goto out;
 
-       length = security_sid_to_context(newsid, &newcon, &len);
+       length = security_sid_to_context(state, newsid, &newcon, &len);
        if (length)
                goto out;
 
@@ -904,6 +967,8 @@ out:
 
 static ssize_t sel_write_relabel(struct file *file, char *buf, size_t size)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *scon = NULL, *tcon = NULL;
        u32 ssid, tsid, newsid;
        u16 tclass;
@@ -911,7 +976,8 @@ static ssize_t sel_write_relabel(struct file *file, char *buf, size_t size)
        char *newcon = NULL;
        u32 len;
 
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
                              SECCLASS_SECURITY, SECURITY__COMPUTE_RELABEL,
                              NULL);
        if (length)
@@ -931,19 +997,19 @@ static ssize_t sel_write_relabel(struct file *file, char *buf, size_t size)
        if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
                goto out;
 
-       length = security_context_str_to_sid(scon, &ssid, GFP_KERNEL);
+       length = security_context_str_to_sid(state, scon, &ssid, GFP_KERNEL);
        if (length)
                goto out;
 
-       length = security_context_str_to_sid(tcon, &tsid, GFP_KERNEL);
+       length = security_context_str_to_sid(state, tcon, &tsid, GFP_KERNEL);
        if (length)
                goto out;
 
-       length = security_change_sid(ssid, tsid, tclass, &newsid);
+       length = security_change_sid(state, ssid, tsid, tclass, &newsid);
        if (length)
                goto out;
 
-       length = security_sid_to_context(newsid, &newcon, &len);
+       length = security_sid_to_context(state, newsid, &newcon, &len);
        if (length)
                goto out;
 
@@ -962,6 +1028,8 @@ out:
 
 static ssize_t sel_write_user(struct file *file, char *buf, size_t size)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *con = NULL, *user = NULL, *ptr;
        u32 sid, *sids = NULL;
        ssize_t length;
@@ -969,7 +1037,8 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size)
        int i, rc;
        u32 len, nsids;
 
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
                              SECCLASS_SECURITY, SECURITY__COMPUTE_USER,
                              NULL);
        if (length)
@@ -989,18 +1058,18 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size)
        if (sscanf(buf, "%s %s", con, user) != 2)
                goto out;
 
-       length = security_context_str_to_sid(con, &sid, GFP_KERNEL);
+       length = security_context_str_to_sid(state, con, &sid, GFP_KERNEL);
        if (length)
                goto out;
 
-       length = security_get_user_sids(sid, user, &sids, &nsids);
+       length = security_get_user_sids(state, sid, user, &sids, &nsids);
        if (length)
                goto out;
 
        length = sprintf(buf, "%u", nsids) + 1;
        ptr = buf + length;
        for (i = 0; i < nsids; i++) {
-               rc = security_sid_to_context(sids[i], &newcon, &len);
+               rc = security_sid_to_context(state, sids[i], &newcon, &len);
                if (rc) {
                        length = rc;
                        goto out;
@@ -1024,6 +1093,8 @@ out:
 
 static ssize_t sel_write_member(struct file *file, char *buf, size_t size)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *scon = NULL, *tcon = NULL;
        u32 ssid, tsid, newsid;
        u16 tclass;
@@ -1031,7 +1102,8 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size)
        char *newcon = NULL;
        u32 len;
 
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
                              SECCLASS_SECURITY, SECURITY__COMPUTE_MEMBER,
                              NULL);
        if (length)
@@ -1051,19 +1123,19 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size)
        if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
                goto out;
 
-       length = security_context_str_to_sid(scon, &ssid, GFP_KERNEL);
+       length = security_context_str_to_sid(state, scon, &ssid, GFP_KERNEL);
        if (length)
                goto out;
 
-       length = security_context_str_to_sid(tcon, &tsid, GFP_KERNEL);
+       length = security_context_str_to_sid(state, tcon, &tsid, GFP_KERNEL);
        if (length)
                goto out;
 
-       length = security_member_sid(ssid, tsid, tclass, &newsid);
+       length = security_member_sid(state, ssid, tsid, tclass, &newsid);
        if (length)
                goto out;
 
-       length = security_sid_to_context(newsid, &newcon, &len);
+       length = security_sid_to_context(state, newsid, &newcon, &len);
        if (length)
                goto out;
 
@@ -1097,6 +1169,7 @@ static struct inode *sel_make_inode(struct super_block *sb, int mode)
 static ssize_t sel_read_bool(struct file *filep, char __user *buf,
                             size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(filep)->i_sb->s_fs_info;
        char *page = NULL;
        ssize_t length;
        ssize_t ret;
@@ -1104,68 +1177,71 @@ static ssize_t sel_read_bool(struct file *filep, char __user *buf,
        unsigned index = file_inode(filep)->i_ino & SEL_INO_MASK;
        const char *name = filep->f_path.dentry->d_name.name;
 
-       mutex_lock(&sel_mutex);
+       mutex_lock(&fsi->mutex);
 
        ret = -EINVAL;
-       if (index >= bool_num || strcmp(name, bool_pending_names[index]))
-               goto out;
+       if (index >= fsi->bool_num || strcmp(name,
+                                            fsi->bool_pending_names[index]))
+               goto out_unlock;
 
        ret = -ENOMEM;
        page = (char *)get_zeroed_page(GFP_KERNEL);
        if (!page)
-               goto out;
+               goto out_unlock;
 
-       cur_enforcing = security_get_bool_value(index);
+       cur_enforcing = security_get_bool_value(fsi->state, index);
        if (cur_enforcing < 0) {
                ret = cur_enforcing;
-               goto out;
+               goto out_unlock;
        }
        length = scnprintf(page, PAGE_SIZE, "%d %d", cur_enforcing,
-                         bool_pending_values[index]);
+                         fsi->bool_pending_values[index]);
+       mutex_unlock(&fsi->mutex);
        ret = simple_read_from_buffer(buf, count, ppos, page, length);
-out:
-       mutex_unlock(&sel_mutex);
+out_free:
        free_page((unsigned long)page);
        return ret;
+
+out_unlock:
+       mutex_unlock(&fsi->mutex);
+       goto out_free;
 }
 
 static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
                              size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(filep)->i_sb->s_fs_info;
        char *page = NULL;
        ssize_t length;
        int new_value;
        unsigned index = file_inode(filep)->i_ino & SEL_INO_MASK;
        const char *name = filep->f_path.dentry->d_name.name;
 
-       mutex_lock(&sel_mutex);
+       if (count >= PAGE_SIZE)
+               return -ENOMEM;
 
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       /* No partial writes. */
+       if (*ppos != 0)
+               return -EINVAL;
+
+       page = memdup_user_nul(buf, count);
+       if (IS_ERR(page))
+               return PTR_ERR(page);
+
+       mutex_lock(&fsi->mutex);
+
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
                              SECCLASS_SECURITY, SECURITY__SETBOOL,
                              NULL);
        if (length)
                goto out;
 
        length = -EINVAL;
-       if (index >= bool_num || strcmp(name, bool_pending_names[index]))
-               goto out;
-
-       length = -ENOMEM;
-       if (count >= PAGE_SIZE)
-               goto out;
-
-       /* No partial writes. */
-       length = -EINVAL;
-       if (*ppos != 0)
+       if (index >= fsi->bool_num || strcmp(name,
+                                            fsi->bool_pending_names[index]))
                goto out;
 
-       page = memdup_user_nul(buf, count);
-       if (IS_ERR(page)) {
-               length = PTR_ERR(page);
-               page = NULL;
-               goto out;
-       }
-
        length = -EINVAL;
        if (sscanf(page, "%d", &new_value) != 1)
                goto out;
@@ -1173,11 +1249,11 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
        if (new_value)
                new_value = 1;
 
-       bool_pending_values[index] = new_value;
+       fsi->bool_pending_values[index] = new_value;
        length = count;
 
 out:
-       mutex_unlock(&sel_mutex);
+       mutex_unlock(&fsi->mutex);
        kfree(page);
        return length;
 }
@@ -1192,47 +1268,45 @@ static ssize_t sel_commit_bools_write(struct file *filep,
                                      const char __user *buf,
                                      size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(filep)->i_sb->s_fs_info;
        char *page = NULL;
        ssize_t length;
        int new_value;
 
-       mutex_lock(&sel_mutex);
-
-       length = avc_has_perm(current_sid(), SECINITSID_SECURITY,
-                             SECCLASS_SECURITY, SECURITY__SETBOOL,
-                             NULL);
-       if (length)
-               goto out;
-
-       length = -ENOMEM;
        if (count >= PAGE_SIZE)
-               goto out;
+               return -ENOMEM;
 
        /* No partial writes. */
-       length = -EINVAL;
        if (*ppos != 0)
-               goto out;
+               return -EINVAL;
 
        page = memdup_user_nul(buf, count);
-       if (IS_ERR(page)) {
-               length = PTR_ERR(page);
-               page = NULL;
+       if (IS_ERR(page))
+               return PTR_ERR(page);
+
+       mutex_lock(&fsi->mutex);
+
+       length = avc_has_perm(&selinux_state,
+                             current_sid(), SECINITSID_SECURITY,
+                             SECCLASS_SECURITY, SECURITY__SETBOOL,
+                             NULL);
+       if (length)
                goto out;
-       }
 
        length = -EINVAL;
        if (sscanf(page, "%d", &new_value) != 1)
                goto out;
 
        length = 0;
-       if (new_value && bool_pending_values)
-               length = security_set_bools(bool_num, bool_pending_values);
+       if (new_value && fsi->bool_pending_values)
+               length = security_set_bools(fsi->state, fsi->bool_num,
+                                           fsi->bool_pending_values);
 
        if (!length)
                length = count;
 
 out:
-       mutex_unlock(&sel_mutex);
+       mutex_unlock(&fsi->mutex);
        kfree(page);
        return length;
 }
@@ -1250,12 +1324,12 @@ static void sel_remove_entries(struct dentry *de)
 
 #define BOOL_DIR_NAME "booleans"
 
-static int sel_make_bools(void)
+static int sel_make_bools(struct selinux_fs_info *fsi)
 {
        int i, ret;
        ssize_t len;
        struct dentry *dentry = NULL;
-       struct dentry *dir = bool_dir;
+       struct dentry *dir = fsi->bool_dir;
        struct inode *inode = NULL;
        struct inode_security_struct *isec;
        char **names = NULL, *page;
@@ -1264,13 +1338,13 @@ static int sel_make_bools(void)
        u32 sid;
 
        /* remove any existing files */
-       for (i = 0; i < bool_num; i++)
-               kfree(bool_pending_names[i]);
-       kfree(bool_pending_names);
-       kfree(bool_pending_values);
-       bool_num = 0;
-       bool_pending_names = NULL;
-       bool_pending_values = NULL;
+       for (i = 0; i < fsi->bool_num; i++)
+               kfree(fsi->bool_pending_names[i]);
+       kfree(fsi->bool_pending_names);
+       kfree(fsi->bool_pending_values);
+       fsi->bool_num = 0;
+       fsi->bool_pending_names = NULL;
+       fsi->bool_pending_values = NULL;
 
        sel_remove_entries(dir);
 
@@ -1279,7 +1353,7 @@ static int sel_make_bools(void)
        if (!page)
                goto out;
 
-       ret = security_get_bools(&num, &names, &values);
+       ret = security_get_bools(fsi->state, &num, &names, &values);
        if (ret)
                goto out;
 
@@ -1300,7 +1374,8 @@ static int sel_make_bools(void)
                        goto out;
 
                isec = (struct inode_security_struct *)inode->i_security;
-               ret = security_genfs_sid("selinuxfs", page, SECCLASS_FILE, &sid);
+               ret = security_genfs_sid(fsi->state, "selinuxfs", page,
+                                        SECCLASS_FILE, &sid);
                if (ret) {
                        pr_warn_ratelimited("SELinux: no sid found, defaulting to security isid for %s\n",
                                           page);
@@ -1313,9 +1388,9 @@ static int sel_make_bools(void)
                inode->i_ino = i|SEL_BOOL_INO_OFFSET;
                d_add(dentry, inode);
        }
-       bool_num = num;
-       bool_pending_names = names;
-       bool_pending_values = values;
+       fsi->bool_num = num;
+       fsi->bool_pending_names = names;
+       fsi->bool_pending_values = values;
 
        free_page((unsigned long)page);
        return 0;
@@ -1333,17 +1408,16 @@ out:
        return ret;
 }
 
-#define NULL_FILE_NAME "null"
-
-struct path selinux_null;
-
 static ssize_t sel_read_avc_cache_threshold(struct file *filp, char __user *buf,
                                            size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(filp)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char tmpbuf[TMPBUFLEN];
        ssize_t length;
 
-       length = scnprintf(tmpbuf, TMPBUFLEN, "%u", avc_cache_threshold);
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%u",
+                          avc_get_cache_threshold(state->avc));
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
@@ -1352,11 +1426,14 @@ static ssize_t sel_write_avc_cache_threshold(struct file *file,
                                             size_t count, loff_t *ppos)
 
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *page;
        ssize_t ret;
        unsigned int new_value;
 
-       ret = avc_has_perm(current_sid(), SECINITSID_SECURITY,
+       ret = avc_has_perm(&selinux_state,
+                          current_sid(), SECINITSID_SECURITY,
                           SECCLASS_SECURITY, SECURITY__SETSECPARAM,
                           NULL);
        if (ret)
@@ -1377,7 +1454,7 @@ static ssize_t sel_write_avc_cache_threshold(struct file *file,
        if (sscanf(page, "%u", &new_value) != 1)
                goto out;
 
-       avc_cache_threshold = new_value;
+       avc_set_cache_threshold(state->avc, new_value);
 
        ret = count;
 out:
@@ -1388,6 +1465,8 @@ out:
 static ssize_t sel_read_avc_hash_stats(struct file *filp, char __user *buf,
                                       size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(filp)->i_sb->s_fs_info;
+       struct selinux_state *state = fsi->state;
        char *page;
        ssize_t length;
 
@@ -1395,7 +1474,7 @@ static ssize_t sel_read_avc_hash_stats(struct file *filp, char __user *buf,
        if (!page)
                return -ENOMEM;
 
-       length = avc_get_hash_stats(page);
+       length = avc_get_hash_stats(state->avc, page);
        if (length >= 0)
                length = simple_read_from_buffer(buf, count, ppos, page, length);
        free_page((unsigned long)page);
@@ -1486,6 +1565,8 @@ static const struct file_operations sel_avc_cache_stats_ops = {
 
 static int sel_make_avc_files(struct dentry *dir)
 {
+       struct super_block *sb = dir->d_sb;
+       struct selinux_fs_info *fsi = sb->s_fs_info;
        int i;
        static const struct tree_descr files[] = {
                { "cache_threshold",
@@ -1509,7 +1590,7 @@ static int sel_make_avc_files(struct dentry *dir)
                        return -ENOMEM;
 
                inode->i_fop = files[i].ops;
-               inode->i_ino = ++sel_last_ino;
+               inode->i_ino = ++fsi->last_ino;
                d_add(dentry, inode);
        }
 
@@ -1519,12 +1600,13 @@ static int sel_make_avc_files(struct dentry *dir)
 static ssize_t sel_read_initcon(struct file *file, char __user *buf,
                                size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
        char *con;
        u32 sid, len;
        ssize_t ret;
 
        sid = file_inode(file)->i_ino&SEL_INO_MASK;
-       ret = security_sid_to_context(sid, &con, &len);
+       ret = security_sid_to_context(fsi->state, sid, &con, &len);
        if (ret)
                return ret;
 
@@ -1612,12 +1694,13 @@ static const struct file_operations sel_perm_ops = {
 static ssize_t sel_read_policycap(struct file *file, char __user *buf,
                                  size_t count, loff_t *ppos)
 {
+       struct selinux_fs_info *fsi = file_inode(file)->i_sb->s_fs_info;
        int value;
        char tmpbuf[TMPBUFLEN];
        ssize_t length;
        unsigned long i_ino = file_inode(file)->i_ino;
 
-       value = security_policycap_supported(i_ino & SEL_INO_MASK);
+       value = security_policycap_supported(fsi->state, i_ino & SEL_INO_MASK);
        length = scnprintf(tmpbuf, TMPBUFLEN, "%d", value);
 
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
@@ -1631,10 +1714,11 @@ static const struct file_operations sel_policycap_ops = {
 static int sel_make_perm_files(char *objclass, int classvalue,
                                struct dentry *dir)
 {
+       struct selinux_fs_info *fsi = dir->d_sb->s_fs_info;
        int i, rc, nperms;
        char **perms;
 
-       rc = security_get_permissions(objclass, &perms, &nperms);
+       rc = security_get_permissions(fsi->state, objclass, &perms, &nperms);
        if (rc)
                return rc;
 
@@ -1668,6 +1752,8 @@ out:
 static int sel_make_class_dir_entries(char *classname, int index,
                                        struct dentry *dir)
 {
+       struct super_block *sb = dir->d_sb;
+       struct selinux_fs_info *fsi = sb->s_fs_info;
        struct dentry *dentry = NULL;
        struct inode *inode = NULL;
        int rc;
@@ -1684,7 +1770,7 @@ static int sel_make_class_dir_entries(char *classname, int index,
        inode->i_ino = sel_class_to_ino(index);
        d_add(dentry, inode);
 
-       dentry = sel_make_dir(dir, "perms", &last_class_ino);
+       dentry = sel_make_dir(dir, "perms", &fsi->last_class_ino);
        if (IS_ERR(dentry))
                return PTR_ERR(dentry);
 
@@ -1693,26 +1779,27 @@ static int sel_make_class_dir_entries(char *classname, int index,
        return rc;
 }
 
-static int sel_make_classes(void)
+static int sel_make_classes(struct selinux_fs_info *fsi)
 {
+
        int rc, nclasses, i;
        char **classes;
 
        /* delete any existing entries */
-       sel_remove_entries(class_dir);
+       sel_remove_entries(fsi->class_dir);
 
-       rc = security_get_classes(&classes, &nclasses);
+       rc = security_get_classes(fsi->state, &classes, &nclasses);
        if (rc)
                return rc;
 
        /* +2 since classes are 1-indexed */
-       last_class_ino = sel_class_to_ino(nclasses + 2);
+       fsi->last_class_ino = sel_class_to_ino(nclasses + 2);
 
        for (i = 0; i < nclasses; i++) {
                struct dentry *class_name_dir;
 
-               class_name_dir = sel_make_dir(class_dir, classes[i],
-                               &last_class_ino);
+               class_name_dir = sel_make_dir(fsi->class_dir, classes[i],
+                                             &fsi->last_class_ino);
                if (IS_ERR(class_name_dir)) {
                        rc = PTR_ERR(class_name_dir);
                        goto out;
@@ -1732,25 +1819,25 @@ out:
        return rc;
 }
 
-static int sel_make_policycap(void)
+static int sel_make_policycap(struct selinux_fs_info *fsi)
 {
        unsigned int iter;
        struct dentry *dentry = NULL;
        struct inode *inode = NULL;
 
-       sel_remove_entries(policycap_dir);
+       sel_remove_entries(fsi->policycap_dir);
 
        for (iter = 0; iter <= POLICYDB_CAPABILITY_MAX; iter++) {
                if (iter < ARRAY_SIZE(selinux_policycap_names))
-                       dentry = d_alloc_name(policycap_dir,
+                       dentry = d_alloc_name(fsi->policycap_dir,
                                              selinux_policycap_names[iter]);
                else
-                       dentry = d_alloc_name(policycap_dir, "unknown");
+                       dentry = d_alloc_name(fsi->policycap_dir, "unknown");
 
                if (dentry == NULL)
                        return -ENOMEM;
 
-               inode = sel_make_inode(policycap_dir->d_sb, S_IFREG | S_IRUGO);
+               inode = sel_make_inode(fsi->sb, S_IFREG | 0444);
                if (inode == NULL)
                        return -ENOMEM;
 
@@ -1789,8 +1876,11 @@ static struct dentry *sel_make_dir(struct dentry *dir, const char *name,
        return dentry;
 }
 
+#define NULL_FILE_NAME "null"
+
 static int sel_fill_super(struct super_block *sb, void *data, int silent)
 {
+       struct selinux_fs_info *fsi;
        int ret;
        struct dentry *dentry;
        struct inode *inode;
@@ -1818,14 +1908,20 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
                                        S_IWUGO},
                /* last one */ {""}
        };
+
+       ret = selinux_fs_info_create(sb);
+       if (ret)
+               goto err;
+
        ret = simple_fill_super(sb, SELINUX_MAGIC, selinux_files);
        if (ret)
                goto err;
 
-       bool_dir = sel_make_dir(sb->s_root, BOOL_DIR_NAME, &sel_last_ino);
-       if (IS_ERR(bool_dir)) {
-               ret = PTR_ERR(bool_dir);
-               bool_dir = NULL;
+       fsi = sb->s_fs_info;
+       fsi->bool_dir = sel_make_dir(sb->s_root, BOOL_DIR_NAME, &fsi->last_ino);
+       if (IS_ERR(fsi->bool_dir)) {
+               ret = PTR_ERR(fsi->bool_dir);
+               fsi->bool_dir = NULL;
                goto err;
        }
 
@@ -1839,7 +1935,7 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
        if (!inode)
                goto err;
 
-       inode->i_ino = ++sel_last_ino;
+       inode->i_ino = ++fsi->last_ino;
        isec = (struct inode_security_struct *)inode->i_security;
        isec->sid = SECINITSID_DEVNULL;
        isec->sclass = SECCLASS_CHR_FILE;
@@ -1847,9 +1943,8 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
 
        init_special_inode(inode, S_IFCHR | S_IRUGO | S_IWUGO, MKDEV(MEM_MAJOR, 3));
        d_add(dentry, inode);
-       selinux_null.dentry = dentry;
 
-       dentry = sel_make_dir(sb->s_root, "avc", &sel_last_ino);
+       dentry = sel_make_dir(sb->s_root, "avc", &fsi->last_ino);
        if (IS_ERR(dentry)) {
                ret = PTR_ERR(dentry);
                goto err;
@@ -1859,7 +1954,7 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
        if (ret)
                goto err;
 
-       dentry = sel_make_dir(sb->s_root, "initial_contexts", &sel_last_ino);
+       dentry = sel_make_dir(sb->s_root, "initial_contexts", &fsi->last_ino);
        if (IS_ERR(dentry)) {
                ret = PTR_ERR(dentry);
                goto err;
@@ -1869,23 +1964,31 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
        if (ret)
                goto err;
 
-       class_dir = sel_make_dir(sb->s_root, "class", &sel_last_ino);
-       if (IS_ERR(class_dir)) {
-               ret = PTR_ERR(class_dir);
-               class_dir = NULL;
+       fsi->class_dir = sel_make_dir(sb->s_root, "class", &fsi->last_ino);
+       if (IS_ERR(fsi->class_dir)) {
+               ret = PTR_ERR(fsi->class_dir);
+               fsi->class_dir = NULL;
                goto err;
        }
 
-       policycap_dir = sel_make_dir(sb->s_root, "policy_capabilities", &sel_last_ino);
-       if (IS_ERR(policycap_dir)) {
-               ret = PTR_ERR(policycap_dir);
-               policycap_dir = NULL;
+       fsi->policycap_dir = sel_make_dir(sb->s_root, "policy_capabilities",
+                                         &fsi->last_ino);
+       if (IS_ERR(fsi->policycap_dir)) {
+               ret = PTR_ERR(fsi->policycap_dir);
+               fsi->policycap_dir = NULL;
                goto err;
        }
+
+       ret = sel_make_policy_nodes(fsi);
+       if (ret)
+               goto err;
        return 0;
 err:
        printk(KERN_ERR "SELinux: %s:  failed while creating inodes\n",
                __func__);
+
+       selinux_fs_info_free(sb);
+
        return ret;
 }
 
@@ -1895,16 +1998,25 @@ static struct dentry *sel_mount(struct file_system_type *fs_type,
        return mount_single(fs_type, flags, data, sel_fill_super);
 }
 
+static void sel_kill_sb(struct super_block *sb)
+{
+       selinux_fs_info_free(sb);
+       kill_litter_super(sb);
+}
+
 static struct file_system_type sel_fs_type = {
        .name           = "selinuxfs",
        .mount          = sel_mount,
-       .kill_sb        = kill_litter_super,
+       .kill_sb        = sel_kill_sb,
 };
 
 struct vfsmount *selinuxfs_mount;
+struct path selinux_null;
 
 static int __init init_sel_fs(void)
 {
+       struct qstr null_name = QSTR_INIT(NULL_FILE_NAME,
+                                         sizeof(NULL_FILE_NAME)-1);
        int err;
 
        if (!selinux_enabled)
@@ -1926,6 +2038,13 @@ static int __init init_sel_fs(void)
                err = PTR_ERR(selinuxfs_mount);
                selinuxfs_mount = NULL;
        }
+       selinux_null.dentry = d_hash_and_lookup(selinux_null.mnt->mnt_root,
+                                               &null_name);
+       if (IS_ERR(selinux_null.dentry)) {
+               pr_err("selinuxfs:  could not lookup null!\n");
+               err = PTR_ERR(selinux_null.dentry);
+               selinux_null.dentry = NULL;
+       }
 
        return err;
 }
@@ -1936,6 +2055,7 @@ __initcall(init_sel_fs);
 void exit_sel_fs(void)
 {
        sysfs_remove_mount_point(fs_kobj, "selinux");
+       dput(selinux_null.dentry);
        kern_unmount(selinuxfs_mount);
        unregister_filesystem(&sel_fs_type);
 }