Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 586 insertions, 353 deletions

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 79a1bb635662..35459340019e 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -28,6 +28,8 @@
 #include <linux/percpu.h>
 #include <linux/audit.h>
 #include <linux/uaccess.h>
+#include <linux/kobject.h>
+#include <linux/ctype.h>
 
 /* selinuxfs pseudo filesystem for exporting the security policy API.
    Based on the proc code and the fs/nfsd/nfsctl.c code. */
@@ -68,6 +70,8 @@ static int *bool_pending_values;
 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;
 
@@ -110,6 +114,8 @@ enum sel_inos {
         SEL_COMPAT_NET, /* whether to use old compat network packet controls */
         SEL_REJECT_UNKNOWN, /* export unknown reject handling to userspace */
         SEL_DENY_UNKNOWN, /* export unknown deny handling to userspace */
+        SEL_STATUS,     /* export current status using mmap() */
+        SEL_POLICY,     /* allow userspace to read the in kernel policy */
         SEL_INO_NEXT,   /* The next inode number to use */
 };
 
@@ -137,19 +143,24 @@ static ssize_t sel_write_enforce(struct file *file, const char __user *buf,
                                  size_t count, loff_t *ppos)
 
 {
-        char *page;
+        char *page = NULL;
         ssize_t length;
         int new_value;
 
+        length = -ENOMEM;
         if (count >= PAGE_SIZE)
-                return -ENOMEM;
-        if (*ppos != 0) {
-                /* No partial writes. */
-                return -EINVAL;
-        }
+                goto out;
+
+        /* No partial writes. */
+        length = EINVAL;
+        if (*ppos != 0)
+                goto out;
+
+        length = -ENOMEM;
         page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page)
-                return -ENOMEM;
+                goto out;
+
         length = -EFAULT;
         if (copy_from_user(page, buf, count))
                 goto out;
@@ -171,6 +182,7 @@ static ssize_t sel_write_enforce(struct file *file, const char __user *buf,
                 if (selinux_enforcing)
                         avc_ss_reset(0);
                 selnl_notify_setenforce(selinux_enforcing);
+                selinux_status_update_setenforce(selinux_enforcing);
         }
         length = count;
 out:
@@ -205,25 +217,83 @@ static const struct file_operations sel_handle_unknown_ops = {
         .llseek         = generic_file_llseek,
 };
 
+static int sel_open_handle_status(struct inode *inode, struct file *filp)
+{
+        struct page    *status = selinux_kernel_status_page();
+
+        if (!status)
+                return -ENOMEM;
+
+        filp->private_data = status;
+
+        return 0;
+}
+
+static ssize_t sel_read_handle_status(struct file *filp, char __user *buf,
+                                      size_t count, loff_t *ppos)
+{
+        struct page    *status = filp->private_data;
+
+        BUG_ON(!status);
+
+        return simple_read_from_buffer(buf, count, ppos,
+                                       page_address(status),
+                                       sizeof(struct selinux_kernel_status));
+}
+
+static int sel_mmap_handle_status(struct file *filp,
+                                  struct vm_area_struct *vma)
+{
+        struct page    *status = filp->private_data;
+        unsigned long   size = vma->vm_end - vma->vm_start;
+
+        BUG_ON(!status);
+
+        /* only allows one page from the head */
+        if (vma->vm_pgoff > 0 || size != PAGE_SIZE)
+                return -EIO;
+        /* disallow writable mapping */
+        if (vma->vm_flags & VM_WRITE)
+                return -EPERM;
+        /* disallow mprotect() turns it into writable */
+        vma->vm_flags &= ~VM_MAYWRITE;
+
+        return remap_pfn_range(vma, vma->vm_start,
+                               page_to_pfn(status),
+                               size, vma->vm_page_prot);
+}
+
+static const struct file_operations sel_handle_status_ops = {
+        .open           = sel_open_handle_status,
+        .read           = sel_read_handle_status,
+        .mmap           = sel_mmap_handle_status,
+        .llseek         = generic_file_llseek,
+};
+
 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
 static ssize_t sel_write_disable(struct file *file, const char __user *buf,
                                  size_t count, loff_t *ppos)
 
 {
-        char *page;
+        char *page = NULL;
         ssize_t length;
         int new_value;
         extern int selinux_disable(void);
 
+        length = -ENOMEM;
         if (count >= PAGE_SIZE)
-                return -ENOMEM;
-        if (*ppos != 0) {
-                /* No partial writes. */
-                return -EINVAL;
-        }
+                goto out;
+
+        /* No partial writes. */
+        length = -EINVAL;
+        if (*ppos != 0)
+                goto out;
+
+        length = -ENOMEM;
         page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page)
-                return -ENOMEM;
+                goto out;
+
         length = -EFAULT;
         if (copy_from_user(page, buf, count))
                 goto out;
@@ -234,7 +304,7 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf,
 
         if (new_value) {
                 length = selinux_disable();
-                if (length < 0)
+                if (length)
                         goto out;
                 audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
                         "selinux=0 auid=%u ses=%u",
@@ -296,11 +366,145 @@ static const struct file_operations sel_mls_ops = {
         .llseek         = generic_file_llseek,
 };
 
+struct policy_load_memory {
+        size_t len;
+        void *data;
+};
+
+static int sel_open_policy(struct inode *inode, struct file *filp)
+{
+        struct policy_load_memory *plm = NULL;
+        int rc;
+
+        BUG_ON(filp->private_data);
+
+        mutex_lock(&sel_mutex);
+
+        rc = task_has_security(current, SECURITY__READ_POLICY);
+        if (rc)
+                goto err;
+
+        rc = -EBUSY;
+        if (policy_opened)
+                goto err;
+
+        rc = -ENOMEM;
+        plm = kzalloc(sizeof(*plm), GFP_KERNEL);
+        if (!plm)
+                goto err;
+
+        if (i_size_read(inode) != security_policydb_len()) {
+                mutex_lock(&inode->i_mutex);
+                i_size_write(inode, security_policydb_len());
+                mutex_unlock(&inode->i_mutex);
+        }
+
+        rc = security_read_policy(&plm->data, &plm->len);
+        if (rc)
+                goto err;
+
+        policy_opened = 1;
+
+        filp->private_data = plm;
+
+        mutex_unlock(&sel_mutex);
+
+        return 0;
+err:
+        mutex_unlock(&sel_mutex);
+
+        if (plm)
+                vfree(plm->data);
+        kfree(plm);
+        return rc;
+}
+
+static int sel_release_policy(struct inode *inode, struct file *filp)
+{
+        struct policy_load_memory *plm = filp->private_data;
+
+        BUG_ON(!plm);
+
+        policy_opened = 0;
+
+        vfree(plm->data);
+        kfree(plm);
+
+        return 0;
+}
+
+static ssize_t sel_read_policy(struct file *filp, char __user *buf,
+                               size_t count, loff_t *ppos)
+{
+        struct policy_load_memory *plm = filp->private_data;
+        int ret;
+
+        mutex_lock(&sel_mutex);
+
+        ret = task_has_security(current, SECURITY__READ_POLICY);
+        if (ret)
+                goto out;
+
+        ret = simple_read_from_buffer(buf, count, ppos, plm->data, plm->len);
+out:
+        mutex_unlock(&sel_mutex);
+        return ret;
+}
+
+static int sel_mmap_policy_fault(struct vm_area_struct *vma,
+                                 struct vm_fault *vmf)
+{
+        struct policy_load_memory *plm = vma->vm_file->private_data;
+        unsigned long offset;
+        struct page *page;
+
+        if (vmf->flags & (FAULT_FLAG_MKWRITE | FAULT_FLAG_WRITE))
+                return VM_FAULT_SIGBUS;
+
+        offset = vmf->pgoff << PAGE_SHIFT;
+        if (offset >= roundup(plm->len, PAGE_SIZE))
+                return VM_FAULT_SIGBUS;
+
+        page = vmalloc_to_page(plm->data + offset);
+        get_page(page);
+
+        vmf->page = page;
+
+        return 0;
+}
+
+static struct vm_operations_struct sel_mmap_policy_ops = {
+        .fault = sel_mmap_policy_fault,
+        .page_mkwrite = sel_mmap_policy_fault,
+};
+
+int sel_mmap_policy(struct file *filp, struct vm_area_struct *vma)
+{
+        if (vma->vm_flags & VM_SHARED) {
+                /* do not allow mprotect to make mapping writable */
+                vma->vm_flags &= ~VM_MAYWRITE;
+
+                if (vma->vm_flags & VM_WRITE)
+                        return -EACCES;
+        }
+
+        vma->vm_flags |= VM_RESERVED;
+        vma->vm_ops = &sel_mmap_policy_ops;
+
+        return 0;
+}
+
+static const struct file_operations sel_policy_ops = {
+        .open           = sel_open_policy,
+        .read           = sel_read_policy,
+        .mmap           = sel_mmap_policy,
+        .release        = sel_release_policy,
+};
+
 static ssize_t sel_write_load(struct file *file, const char __user *buf,
                               size_t count, loff_t *ppos)
 
 {
-        int ret;
         ssize_t length;
         void *data = NULL;
 
@@ -310,17 +514,19 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
         if (length)
                 goto out;
 
-        if (*ppos != 0) {
-                /* No partial writes. */
-                length = -EINVAL;
+        /* No partial writes. */
+        length = -EINVAL;
+        if (*ppos != 0)
                 goto out;
-        }
 
-        if ((count > 64 * 1024 * 1024)
-            || (data = vmalloc(count)) == NULL) {
-                length = -ENOMEM;
+        length = -EFBIG;
+        if (count > 64 * 1024 * 1024)
+                goto out;
+
+        length = -ENOMEM;
+        data = vmalloc(count);
+        if (!data)
                 goto out;
-        }
 
         length = -EFAULT;
         if (copy_from_user(data, buf, count) != 0)
@@ -330,23 +536,19 @@ static ssize_t sel_write_load(struct file *file, const char __user *buf,
         if (length)
                 goto out;
 
-        ret = sel_make_bools();
-        if (ret) {
-                length = ret;
+        length = sel_make_bools();
+        if (length)
                 goto out1;
-        }
 
-        ret = sel_make_classes();
-        if (ret) {
-                length = ret;
+        length = sel_make_classes();
+        if (length)
                 goto out1;
-        }
 
-        ret = sel_make_policycap();
-        if (ret)
-                length = ret;
-        else
-                length = count;
+        length = sel_make_policycap();
+        if (length)
+                goto out1;
+
+        length = count;
 
 out1:
         audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,
@@ -366,26 +568,26 @@ static const struct file_operations sel_load_ops = {
 
 static ssize_t sel_write_context(struct file *file, char *buf, size_t size)
 {
-        char *canon;
+        char *canon = NULL;
         u32 sid, len;
         ssize_t length;
 
         length = task_has_security(current, SECURITY__CHECK_CONTEXT);
         if (length)
-                return length;
+                goto out;
 
         length = security_context_to_sid(buf, size, &sid);
-        if (length < 0)
-                return length;
+        if (length)
+                goto out;
 
         length = security_sid_to_context(sid, &canon, &len);
-        if (length < 0)
-                return length;
+        if (length)
+                goto out;
 
+        length = -ERANGE;
         if (len > SIMPLE_TRANSACTION_LIMIT) {
                 printk(KERN_ERR "SELinux: %s:  context size (%u) exceeds "
                         "payload max\n", __func__, len);
-                length = -ERANGE;
                 goto out;
         }
 
@@ -409,23 +611,28 @@ static ssize_t sel_read_checkreqprot(struct file *filp, char __user *buf,
 static ssize_t sel_write_checkreqprot(struct file *file, const char __user *buf,
                                       size_t count, loff_t *ppos)
 {
-        char *page;
+        char *page = NULL;
         ssize_t length;
         unsigned int new_value;
 
         length = task_has_security(current, SECURITY__SETCHECKREQPROT);
         if (length)
-                return length;
+                goto out;
 
+        length = -ENOMEM;
         if (count >= PAGE_SIZE)
-                return -ENOMEM;
-        if (*ppos != 0) {
-                /* No partial writes. */
-                return -EINVAL;
-        }
+                goto out;
+
+        /* No partial writes. */
+        length = -EINVAL;
+        if (*ppos != 0)
+                goto out;
+
+        length = -ENOMEM;
         page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page)
-                return -ENOMEM;
+                goto out;
+
         length = -EFAULT;
         if (copy_from_user(page, buf, count))
                 goto out;
@@ -500,7 +707,7 @@ static const struct file_operations transaction_ops = {
 
 static ssize_t sel_write_access(struct file *file, char *buf, size_t size)
 {
-        char *scon, *tcon;
+        char *scon = NULL, *tcon = NULL;
         u32 ssid, tsid;
         u16 tclass;
         struct av_decision avd;
@@ -508,27 +715,29 @@ static ssize_t sel_write_access(struct file *file, char *buf, size_t size)
 
         length = task_has_security(current, SECURITY__COMPUTE_AV);
         if (length)
-                return length;
+                goto out;
 
         length = -ENOMEM;
         scon = kzalloc(size + 1, GFP_KERNEL);
         if (!scon)
-                return length;
+                goto out;
 
+        length = -ENOMEM;
         tcon = kzalloc(size + 1, GFP_KERNEL);
         if (!tcon)
                 goto out;
 
         length = -EINVAL;
         if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
-                goto out2;
+                goto out;
 
         length = security_context_to_sid(scon, strlen(scon) + 1, &ssid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
+
         length = security_context_to_sid(tcon, strlen(tcon) + 1, &tsid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
         security_compute_av_user(ssid, tsid, tclass, &avd);
 
@@ -537,133 +746,177 @@ static ssize_t sel_write_access(struct file *file, char *buf, size_t size)
                           avd.allowed, 0xffffffff,
                           avd.auditallow, avd.auditdeny,
                           avd.seqno, avd.flags);
-out2:
-        kfree(tcon);
 out:
+        kfree(tcon);
         kfree(scon);
         return length;
 }
 
+static inline int hexcode_to_int(int code) {
+        if (code == '\0' || !isxdigit(code))
+                return -1;
+        if (isdigit(code))
+                return code - '0';
+        return tolower(code) - 'a' + 10;
+}
+
 static ssize_t sel_write_create(struct file *file, char *buf, size_t size)
 {
-        char *scon, *tcon;
+        char *scon = NULL, *tcon = NULL;
+        char *namebuf = NULL, *objname = NULL;
         u32 ssid, tsid, newsid;
         u16 tclass;
         ssize_t length;
-        char *newcon;
+        char *newcon = NULL;
         u32 len;
+        int nargs;
 
         length = task_has_security(current, SECURITY__COMPUTE_CREATE);
         if (length)
-                return length;
+                goto out;
 
         length = -ENOMEM;
         scon = kzalloc(size + 1, GFP_KERNEL);
         if (!scon)
-                return length;
+                goto out;
 
+        length = -ENOMEM;
         tcon = kzalloc(size + 1, GFP_KERNEL);
         if (!tcon)
                 goto out;
 
+        length = -ENOMEM;
+        namebuf = kzalloc(size + 1, GFP_KERNEL);
+        if (!namebuf)
+                goto out;
+
         length = -EINVAL;
-        if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
-                goto out2;
+        nargs = sscanf(buf, "%s %s %hu %s", scon, tcon, &tclass, namebuf);
+        if (nargs < 3 || nargs > 4)
+                goto out;
+        if (nargs == 4) {
+                /*
+                 * If and when the name of new object to be queried contains
+                 * either whitespace or multibyte characters, they shall be
+                 * encoded based on the percentage-encoding rule.
+                 * If not encoded, the sscanf logic picks up only left-half
+                 * of the supplied name; splitted by a whitespace unexpectedly.
+                 */
+                char   *r, *w;
+                int     c1, c2;
+
+                r = w = namebuf;
+                do {
+                        c1 = *r++;
+                        if (c1 == '+')
+                                c1 = ' ';
+                        else if (c1 == '%') {
+                                if ((c1 = hexcode_to_int(*r++)) < 0)
+                                        goto out;
+                                if ((c2 = hexcode_to_int(*r++)) < 0)
+                                        goto out;
+                                c1 = (c1 << 4) | c2;
+                        }
+                        *w++ = c1;
+                } while (c1 != '\0');
+
+                objname = namebuf;
+        }
 
         length = security_context_to_sid(scon, strlen(scon) + 1, &ssid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
+
         length = security_context_to_sid(tcon, strlen(tcon) + 1, &tsid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
-        length = security_transition_sid_user(ssid, tsid, tclass, &newsid);
-        if (length < 0)
-                goto out2;
+        length = security_transition_sid_user(ssid, tsid, tclass,
+                                              objname, &newsid);
+        if (length)
+                goto out;
 
         length = security_sid_to_context(newsid, &newcon, &len);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
+        length = -ERANGE;
         if (len > SIMPLE_TRANSACTION_LIMIT) {
                 printk(KERN_ERR "SELinux: %s:  context size (%u) exceeds "
                         "payload max\n", __func__, len);
-                length = -ERANGE;
-                goto out3;
+                goto out;
         }
 
         memcpy(buf, newcon, len);
         length = len;
-out3:
+out:
         kfree(newcon);
-out2:
+        kfree(namebuf);
         kfree(tcon);
-out:
         kfree(scon);
         return length;
 }
 
 static ssize_t sel_write_relabel(struct file *file, char *buf, size_t size)
 {
-        char *scon, *tcon;
+        char *scon = NULL, *tcon = NULL;
         u32 ssid, tsid, newsid;
         u16 tclass;
         ssize_t length;
-        char *newcon;
+        char *newcon = NULL;
         u32 len;
 
         length = task_has_security(current, SECURITY__COMPUTE_RELABEL);
         if (length)
-                return length;
+                goto out;
 
         length = -ENOMEM;
         scon = kzalloc(size + 1, GFP_KERNEL);
         if (!scon)
-                return length;
+                goto out;
 
+        length = -ENOMEM;
         tcon = kzalloc(size + 1, GFP_KERNEL);
         if (!tcon)
                 goto out;
 
         length = -EINVAL;
         if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
-                goto out2;
+                goto out;
 
         length = security_context_to_sid(scon, strlen(scon) + 1, &ssid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
+
         length = security_context_to_sid(tcon, strlen(tcon) + 1, &tsid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
         length = security_change_sid(ssid, tsid, tclass, &newsid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
         length = security_sid_to_context(newsid, &newcon, &len);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
-        if (len > SIMPLE_TRANSACTION_LIMIT) {
-                length = -ERANGE;
-                goto out3;
-        }
+        length = -ERANGE;
+        if (len > SIMPLE_TRANSACTION_LIMIT)
+                goto out;
 
         memcpy(buf, newcon, len);
         length = len;
-out3:
+out:
         kfree(newcon);
-out2:
         kfree(tcon);
-out:
         kfree(scon);
         return length;
 }
 
 static ssize_t sel_write_user(struct file *file, char *buf, size_t size)
 {
-        char *con, *user, *ptr;
-        u32 sid, *sids;
+        char *con = NULL, *user = NULL, *ptr;
+        u32 sid, *sids = NULL;
         ssize_t length;
         char *newcon;
         int i, rc;
@@ -671,28 +924,29 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size)
 
         length = task_has_security(current, SECURITY__COMPUTE_USER);
         if (length)
-                return length;
+                goto out;
 
         length = -ENOMEM;
         con = kzalloc(size + 1, GFP_KERNEL);
         if (!con)
-                return length;
+                goto out;
 
+        length = -ENOMEM;
         user = kzalloc(size + 1, GFP_KERNEL);
         if (!user)
                 goto out;
 
         length = -EINVAL;
         if (sscanf(buf, "%s %s", con, user) != 2)
-                goto out2;
+                goto out;
 
         length = security_context_to_sid(con, strlen(con) + 1, &sid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
         length = security_get_user_sids(sid, user, &sids, &nsids);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
         length = sprintf(buf, "%u", nsids) + 1;
         ptr = buf + length;
@@ -700,82 +954,80 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size)
                 rc = security_sid_to_context(sids[i], &newcon, &len);
                 if (rc) {
                         length = rc;
-                        goto out3;
+                        goto out;
                 }
                 if ((length + len) >= SIMPLE_TRANSACTION_LIMIT) {
                         kfree(newcon);
                         length = -ERANGE;
-                        goto out3;
+                        goto out;
                 }
                 memcpy(ptr, newcon, len);
                 kfree(newcon);
                 ptr += len;
                 length += len;
         }
-out3:
+out:
         kfree(sids);
-out2:
         kfree(user);
-out:
         kfree(con);
         return length;
 }
 
 static ssize_t sel_write_member(struct file *file, char *buf, size_t size)
 {
-        char *scon, *tcon;
+        char *scon = NULL, *tcon = NULL;
         u32 ssid, tsid, newsid;
         u16 tclass;
         ssize_t length;
-        char *newcon;
+        char *newcon = NULL;
         u32 len;
 
         length = task_has_security(current, SECURITY__COMPUTE_MEMBER);
         if (length)
-                return length;
+                goto out;
 
         length = -ENOMEM;
         scon = kzalloc(size + 1, GFP_KERNEL);
         if (!scon)
-                return length;
+                goto out;
 
+        length = -ENOMEM;
         tcon = kzalloc(size + 1, GFP_KERNEL);
         if (!tcon)
                 goto out;
 
         length = -EINVAL;
         if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
-                goto out2;
+                goto out;
 
         length = security_context_to_sid(scon, strlen(scon) + 1, &ssid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
+
         length = security_context_to_sid(tcon, strlen(tcon) + 1, &tsid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
         length = security_member_sid(ssid, tsid, tclass, &newsid);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
         length = security_sid_to_context(newsid, &newcon, &len);
-        if (length < 0)
-                goto out2;
+        if (length)
+                goto out;
 
+        length = -ERANGE;
         if (len > SIMPLE_TRANSACTION_LIMIT) {
                 printk(KERN_ERR "SELinux: %s:  context size (%u) exceeds "
                         "payload max\n", __func__, len);
-                length = -ERANGE;
-                goto out3;
+                goto out;
         }
 
         memcpy(buf, newcon, len);
         length = len;
-out3:
+out:
         kfree(newcon);
-out2:
         kfree(tcon);
-out:
         kfree(scon);
         return length;
 }
@@ -804,16 +1056,14 @@ static ssize_t sel_read_bool(struct file *filep, char __user *buf,
 
         mutex_lock(&sel_mutex);
 
-        if (index >= bool_num || strcmp(name, bool_pending_names[index])) {
-                ret = -EINVAL;
+        ret = -EINVAL;
+        if (index >= bool_num || strcmp(name, bool_pending_names[index]))
                 goto out;
-        }
 
+        ret = -ENOMEM;
         page = (char *)get_zeroed_page(GFP_KERNEL);
-        if (!page) {
-                ret = -ENOMEM;
+        if (!page)
                 goto out;
-        }
 
         cur_enforcing = security_get_bool_value(index);
         if (cur_enforcing < 0) {
@@ -825,8 +1075,7 @@ static ssize_t sel_read_bool(struct file *filep, char __user *buf,
         ret = simple_read_from_buffer(buf, count, ppos, page, length);
 out:
         mutex_unlock(&sel_mutex);
-        if (page)
-                free_page((unsigned long)page);
+        free_page((unsigned long)page);
         return ret;
 }
 
@@ -846,26 +1095,23 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
         if (length)
                 goto out;
 
-        if (index >= bool_num || strcmp(name, bool_pending_names[index])) {
-                length = -EINVAL;
+        length = -EINVAL;
+        if (index >= bool_num || strcmp(name, bool_pending_names[index]))
                 goto out;
-        }
 
-        if (count >= PAGE_SIZE) {
-                length = -ENOMEM;
+        length = -ENOMEM;
+        if (count >= PAGE_SIZE)
                 goto out;
-        }
 
-        if (*ppos != 0) {
-                /* No partial writes. */
-                length = -EINVAL;
+        /* No partial writes. */
+        length = -EINVAL;
+        if (*ppos != 0)
                 goto out;
-        }
+
+        length = -ENOMEM;
         page = (char *)get_zeroed_page(GFP_KERNEL);
-        if (!page) {
-                length = -ENOMEM;
+        if (!page)
                 goto out;
-        }
 
         length = -EFAULT;
         if (copy_from_user(page, buf, count))
@@ -883,8 +1129,7 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
 
 out:
         mutex_unlock(&sel_mutex);
-        if (page)
-                free_page((unsigned long) page);
+        free_page((unsigned long) page);
         return length;
 }
 
@@ -908,19 +1153,19 @@ static ssize_t sel_commit_bools_write(struct file *filep,
         if (length)
                 goto out;
 
-        if (count >= PAGE_SIZE) {
-                length = -ENOMEM;
+        length = -ENOMEM;
+        if (count >= PAGE_SIZE)
                 goto out;
-        }
-        if (*ppos != 0) {
-                /* No partial writes. */
+
+        /* No partial writes. */
+        length = -EINVAL;
+        if (*ppos != 0)
                 goto out;
-        }
+
+        length = -ENOMEM;
         page = (char *)get_zeroed_page(GFP_KERNEL);
-        if (!page) {
-                length = -ENOMEM;
+        if (!page)
                 goto out;
-        }
 
         length = -EFAULT;
         if (copy_from_user(page, buf, count))
@@ -930,15 +1175,16 @@ static ssize_t sel_commit_bools_write(struct file *filep,
         if (sscanf(page, "%d", &new_value) != 1)
                 goto out;
 
+        length = 0;
         if (new_value && bool_pending_values)
-                security_set_bools(bool_num, bool_pending_values);
+                length = security_set_bools(bool_num, bool_pending_values);
 
-        length = count;
+        if (!length)
+                length = count;
 
 out:
         mutex_unlock(&sel_mutex);
-        if (page)
-                free_page((unsigned long) page);
+        free_page((unsigned long) page);
         return length;
 }
 
@@ -951,31 +1197,35 @@ static void sel_remove_entries(struct dentry *de)
 {
         struct list_head *node;
 
-        spin_lock(&dcache_lock);
+        spin_lock(&de->d_lock);
         node = de->d_subdirs.next;
         while (node != &de->d_subdirs) {
                 struct dentry *d = list_entry(node, struct dentry, d_u.d_child);
+
+                spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED);
                 list_del_init(node);
 
                 if (d->d_inode) {
-                        d = dget_locked(d);
-                        spin_unlock(&dcache_lock);
+                        dget_dlock(d);
+                        spin_unlock(&de->d_lock);
+                        spin_unlock(&d->d_lock);
                         d_delete(d);
                         simple_unlink(de->d_inode, d);
                         dput(d);
-                        spin_lock(&dcache_lock);
-                }
+                        spin_lock(&de->d_lock);
+                } else
+                        spin_unlock(&d->d_lock);
                 node = de->d_subdirs.next;
         }
 
-        spin_unlock(&dcache_lock);
+        spin_unlock(&de->d_lock);
 }
 
 #define BOOL_DIR_NAME "booleans"
 
 static int sel_make_bools(void)
 {
-        int i, ret = 0;
+        int i, ret;
         ssize_t len;
         struct dentry *dentry = NULL;
         struct dentry *dir = bool_dir;
@@ -996,38 +1246,40 @@ static int sel_make_bools(void)
 
         sel_remove_entries(dir);
 
+        ret = -ENOMEM;
         page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page)
-                return -ENOMEM;
+                goto out;
 
         ret = security_get_bools(&num, &names, &values);
-        if (ret != 0)
+        if (ret)
                 goto out;
 
         for (i = 0; i < num; i++) {
+                ret = -ENOMEM;
                 dentry = d_alloc_name(dir, names[i]);
-                if (!dentry) {
-                        ret = -ENOMEM;
-                        goto err;
-                }
+                if (!dentry)
+                        goto out;
+
+                ret = -ENOMEM;
                 inode = sel_make_inode(dir->d_sb, S_IFREG | S_IRUGO | S_IWUSR);
-                if (!inode) {
-                        ret = -ENOMEM;
-                        goto err;
-                }
+                if (!inode)
+                        goto out;
 
+                ret = -EINVAL;
                 len = snprintf(page, PAGE_SIZE, "/%s/%s", BOOL_DIR_NAME, names[i]);
-                if (len < 0) {
-                        ret = -EINVAL;
-                        goto err;
-                } else if (len >= PAGE_SIZE) {
-                        ret = -ENAMETOOLONG;
-                        goto err;
-                }
+                if (len < 0)
+                        goto out;
+
+                ret = -ENAMETOOLONG;
+                if (len >= PAGE_SIZE)
+                        goto out;
+
                 isec = (struct inode_security_struct *)inode->i_security;
                 ret = security_genfs_sid("selinuxfs", page, SECCLASS_FILE, &sid);
                 if (ret)
-                        goto err;
+                        goto out;
+
                 isec->sid = sid;
                 isec->initialized = 1;
                 inode->i_fop = &sel_bool_ops;
@@ -1037,10 +1289,12 @@ static int sel_make_bools(void)
         bool_num = num;
         bool_pending_names = names;
         bool_pending_values = values;
+
+        free_page((unsigned long)page);
+        return 0;
 out:
         free_page((unsigned long)page);
-        return ret;
-err:
+
         if (names) {
                 for (i = 0; i < num; i++)
                         kfree(names[i]);
@@ -1048,8 +1302,8 @@ err:
         }
         kfree(values);
         sel_remove_entries(dir);
-        ret = -ENOMEM;
-        goto out;
+
+        return ret;
 }
 
 #define NULL_FILE_NAME "null"
@@ -1071,47 +1325,41 @@ static ssize_t sel_write_avc_cache_threshold(struct file *file,
                                              size_t count, loff_t *ppos)
 
 {
-        char *page;
+        char *page = NULL;
         ssize_t ret;
         int new_value;
 
-        if (count >= PAGE_SIZE) {
-                ret = -ENOMEM;
+        ret = task_has_security(current, SECURITY__SETSECPARAM);
+        if (ret)
                 goto out;
-        }
 
-        if (*ppos != 0) {
-                /* No partial writes. */
-                ret = -EINVAL;
+        ret = -ENOMEM;
+        if (count >= PAGE_SIZE)
+                goto out;
+
+        /* No partial writes. */
+        ret = -EINVAL;
+        if (*ppos != 0)
                 goto out;
-        }
 
+        ret = -ENOMEM;
         page = (char *)get_zeroed_page(GFP_KERNEL);
-        if (!page) {
-                ret = -ENOMEM;
+        if (!page)
                 goto out;
-        }
 
-        if (copy_from_user(page, buf, count)) {
-                ret = -EFAULT;
-                goto out_free;
-        }
+        ret = -EFAULT;
+        if (copy_from_user(page, buf, count))
+                goto out;
 
-        if (sscanf(page, "%u", &new_value) != 1) {
-                ret = -EINVAL;
+        ret = -EINVAL;
+        if (sscanf(page, "%u", &new_value) != 1)
                 goto out;
-        }
 
-        if (new_value != avc_cache_threshold) {
-                ret = task_has_security(current, SECURITY__SETSECPARAM);
-                if (ret)
-                        goto out_free;
-                avc_cache_threshold = new_value;
-        }
+        avc_cache_threshold = new_value;
+
         ret = count;
-out_free:
-        free_page((unsigned long)page);
 out:
+        free_page((unsigned long)page);
         return ret;
 }
 
@@ -1119,19 +1367,18 @@ static ssize_t sel_read_avc_hash_stats(struct file *filp, char __user *buf,
                                        size_t count, loff_t *ppos)
 {
         char *page;
-        ssize_t ret = 0;
+        ssize_t length;
 
         page = (char *)__get_free_page(GFP_KERNEL);
-        if (!page) {
-                ret = -ENOMEM;
-                goto out;
-        }
-        ret = avc_get_hash_stats(page);
-        if (ret >= 0)
-                ret = simple_read_from_buffer(buf, count, ppos, page, ret);
+        if (!page)
+                return -ENOMEM;
+
+        length = avc_get_hash_stats(page);
+        if (length >= 0)
+                length = simple_read_from_buffer(buf, count, ppos, page, length);
         free_page((unsigned long)page);
-out:
-        return ret;
+
+        return length;
 }
 
 static const struct file_operations sel_avc_cache_threshold_ops = {
@@ -1181,10 +1428,14 @@ static int sel_avc_stats_seq_show(struct seq_file *seq, void *v)
         if (v == SEQ_START_TOKEN)
                 seq_printf(seq, "lookups hits misses allocations reclaims "
                            "frees\n");
-        else
-                seq_printf(seq, "%u %u %u %u %u %u\n", st->lookups,
-                           st->hits, st->misses, st->allocations,
+        else {
+                unsigned int lookups = st->lookups;
+                unsigned int misses = st->misses;
+                unsigned int hits = lookups - misses;
+                seq_printf(seq, "%u %u %u %u %u %u\n", lookups,
+                           hits, misses, st->allocations,
                            st->reclaims, st->frees);
+        }
         return 0;
 }
 
@@ -1213,7 +1464,7 @@ static const struct file_operations sel_avc_cache_stats_ops = {
 
 static int sel_make_avc_files(struct dentry *dir)
 {
-        int i, ret = 0;
+        int i;
         static struct tree_descr files[] = {
                 { "cache_threshold",
                   &sel_avc_cache_threshold_ops, S_IRUGO|S_IWUSR },
@@ -1228,22 +1479,19 @@ static int sel_make_avc_files(struct dentry *dir)
                 struct dentry *dentry;
 
                 dentry = d_alloc_name(dir, files[i].name);
-                if (!dentry) {
-                        ret = -ENOMEM;
-                        goto out;
-                }
+                if (!dentry)
+                        return -ENOMEM;
 
                 inode = sel_make_inode(dir->d_sb, S_IFREG|files[i].mode);
-                if (!inode) {
-                        ret = -ENOMEM;
-                        goto out;
-                }
+                if (!inode)
+                        return -ENOMEM;
+
                 inode->i_fop = files[i].ops;
                 inode->i_ino = ++sel_last_ino;
                 d_add(dentry, inode);
         }
-out:
-        return ret;
+
+        return 0;
 }
 
 static ssize_t sel_read_initcon(struct file *file, char __user *buf,
@@ -1257,7 +1505,7 @@ static ssize_t sel_read_initcon(struct file *file, char __user *buf,
         inode = file->f_path.dentry->d_inode;
         sid = inode->i_ino&SEL_INO_MASK;
         ret = security_sid_to_context(sid, &con, &len);
-        if (ret < 0)
+        if (ret)
                 return ret;
 
         ret = simple_read_from_buffer(buf, count, ppos, con, len);
@@ -1272,28 +1520,25 @@ static const struct file_operations sel_initcon_ops = {
 
 static int sel_make_initcon_files(struct dentry *dir)
 {
-        int i, ret = 0;
+        int i;
 
         for (i = 1; i <= SECINITSID_NUM; i++) {
                 struct inode *inode;
                 struct dentry *dentry;
                 dentry = d_alloc_name(dir, security_get_initial_sid_context(i));
-                if (!dentry) {
-                        ret = -ENOMEM;
-                        goto out;
-                }
+                if (!dentry)
+                        return -ENOMEM;
 
                 inode = sel_make_inode(dir->d_sb, S_IFREG|S_IRUGO);
-                if (!inode) {
-                        ret = -ENOMEM;
-                        goto out;
-                }
+                if (!inode)
+                        return -ENOMEM;
+
                 inode->i_fop = &sel_initcon_ops;
                 inode->i_ino = i|SEL_INITCON_INO_OFFSET;
                 d_add(dentry, inode);
         }
-out:
-        return ret;
+
+        return 0;
 }
 
 static inline unsigned int sel_div(unsigned long a, unsigned long b)
@@ -1329,15 +1574,13 @@ static ssize_t sel_read_class(struct file *file, char __user *buf,
         unsigned long ino = file->f_path.dentry->d_inode->i_ino;
 
         page = (char *)__get_free_page(GFP_KERNEL);
-        if (!page) {
-                rc = -ENOMEM;
-                goto out;
-        }
+        if (!page)
+                return -ENOMEM;
 
         len = snprintf(page, PAGE_SIZE, "%d", sel_ino_to_class(ino));
         rc = simple_read_from_buffer(buf, count, ppos, page, len);
         free_page((unsigned long)page);
-out:
+
         return rc;
 }
 
@@ -1354,15 +1597,13 @@ static ssize_t sel_read_perm(struct file *file, char __user *buf,
         unsigned long ino = file->f_path.dentry->d_inode->i_ino;
 
         page = (char *)__get_free_page(GFP_KERNEL);
-        if (!page) {
-                rc = -ENOMEM;
-                goto out;
-        }
+        if (!page)
+                return -ENOMEM;
 
         len = snprintf(page, PAGE_SIZE, "%d", sel_ino_to_perm(ino));
         rc = simple_read_from_buffer(buf, count, ppos, page, len);
         free_page((unsigned long)page);
-out:
+
         return rc;
 }
 
@@ -1393,39 +1634,37 @@ static const struct file_operations sel_policycap_ops = {
 static int sel_make_perm_files(char *objclass, int classvalue,
                                 struct dentry *dir)
 {
-        int i, rc = 0, nperms;
+        int i, rc, nperms;
         char **perms;
 
         rc = security_get_permissions(objclass, &perms, &nperms);
         if (rc)
-                goto out;
+                return rc;
 
         for (i = 0; i < nperms; i++) {
                 struct inode *inode;
                 struct dentry *dentry;
 
+                rc = -ENOMEM;
                 dentry = d_alloc_name(dir, perms[i]);
-                if (!dentry) {
-                        rc = -ENOMEM;
-                        goto out1;
-                }
+                if (!dentry)
+                        goto out;
 
+                rc = -ENOMEM;
                 inode = sel_make_inode(dir->d_sb, S_IFREG|S_IRUGO);
-                if (!inode) {
-                        rc = -ENOMEM;
-                        goto out1;
-                }
+                if (!inode)
+                        goto out;
+
                 inode->i_fop = &sel_perm_ops;
                 /* i+1 since perm values are 1-indexed */
                 inode->i_ino = sel_perm_to_ino(classvalue, i + 1);
                 d_add(dentry, inode);
         }
-
-out1:
+        rc = 0;
+out:
         for (i = 0; i < nperms; i++)
                 kfree(perms[i]);
         kfree(perms);
-out:
         return rc;
 }
 
@@ -1437,34 +1676,27 @@ static int sel_make_class_dir_entries(char *classname, int index,
         int rc;
 
         dentry = d_alloc_name(dir, "index");
-        if (!dentry) {
-                rc = -ENOMEM;
-                goto out;
-        }
+        if (!dentry)
+                return -ENOMEM;
 
         inode = sel_make_inode(dir->d_sb, S_IFREG|S_IRUGO);
-        if (!inode) {
-                rc = -ENOMEM;
-                goto out;
-        }
+        if (!inode)
+                return -ENOMEM;
 
         inode->i_fop = &sel_class_ops;
         inode->i_ino = sel_class_to_ino(index);
         d_add(dentry, inode);
 
         dentry = d_alloc_name(dir, "perms");
-        if (!dentry) {
-                rc = -ENOMEM;
-                goto out;
-        }
+        if (!dentry)
+                return -ENOMEM;
 
         rc = sel_make_dir(dir->d_inode, dentry, &last_class_ino);
         if (rc)
-                goto out;
+                return rc;
 
         rc = sel_make_perm_files(classname, index, dentry);
 
-out:
         return rc;
 }
 
@@ -1494,15 +1726,15 @@ static void sel_remove_classes(void)
 
 static int sel_make_classes(void)
 {
-        int rc = 0, nclasses, i;
+        int rc, nclasses, i;
         char **classes;
 
         /* delete any existing entries */
         sel_remove_classes();
 
         rc = security_get_classes(&classes, &nclasses);
-        if (rc < 0)
-                goto out;
+        if (rc)
+                return rc;
 
         /* +2 since classes are 1-indexed */
         last_class_ino = sel_class_to_ino(nclasses + 2);
@@ -1510,29 +1742,27 @@ static int sel_make_classes(void)
         for (i = 0; i < nclasses; i++) {
                 struct dentry *class_name_dir;
 
+                rc = -ENOMEM;
                 class_name_dir = d_alloc_name(class_dir, classes[i]);
-                if (!class_name_dir) {
-                        rc = -ENOMEM;
-                        goto out1;
-                }
+                if (!class_name_dir)
+                        goto out;
 
                 rc = sel_make_dir(class_dir->d_inode, class_name_dir,
                                 &last_class_ino);
                 if (rc)
-                        goto out1;
+                        goto out;
 
                 /* i+1 since class values are 1-indexed */
                 rc = sel_make_class_dir_entries(classes[i], i + 1,
                                 class_name_dir);
                 if (rc)
-                        goto out1;
+                        goto out;
         }
-
-out1:
+        rc = 0;
+out:
         for (i = 0; i < nclasses; i++)
                 kfree(classes[i]);
         kfree(classes);
-out:
         return rc;
 }
 
@@ -1569,14 +1799,12 @@ static int sel_make_policycap(void)
 static int sel_make_dir(struct inode *dir, struct dentry *dentry,
                         unsigned long *ino)
 {
-        int ret = 0;
         struct inode *inode;
 
         inode = sel_make_inode(dir->i_sb, S_IFDIR | S_IRUGO | S_IXUGO);
-        if (!inode) {
-                ret = -ENOMEM;
-                goto out;
-        }
+        if (!inode)
+                return -ENOMEM;
+
         inode->i_op = &simple_dir_inode_operations;
         inode->i_fop = &simple_dir_operations;
         inode->i_ino = ++(*ino);
@@ -1585,8 +1813,8 @@ static int sel_make_dir(struct inode *dir, struct dentry *dentry,
         d_add(dentry, inode);
         /* bump link count on parent directory, too */
         inc_nlink(dir);
-out:
-        return ret;
+
+        return 0;
 }
 
 static int sel_fill_super(struct super_block *sb, void *data, int silent)
@@ -1612,6 +1840,8 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
                 [SEL_CHECKREQPROT] = {"checkreqprot", &sel_checkreqprot_ops, S_IRUGO|S_IWUSR},
                 [SEL_REJECT_UNKNOWN] = {"reject_unknown", &sel_handle_unknown_ops, S_IRUGO},
                 [SEL_DENY_UNKNOWN] = {"deny_unknown", &sel_handle_unknown_ops, S_IRUGO},
+                [SEL_STATUS] = {"status", &sel_handle_status_ops, S_IRUGO},
+                [SEL_POLICY] = {"policy", &sel_policy_ops, S_IRUSR},
                 /* last one */ {""}
         };
         ret = simple_fill_super(sb, SELINUX_MAGIC, selinux_files);
@@ -1620,11 +1850,10 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
 
         root_inode = sb->s_root->d_inode;
 
+        ret = -ENOMEM;
         dentry = d_alloc_name(sb->s_root, BOOL_DIR_NAME);
-        if (!dentry) {
-                ret = -ENOMEM;
+        if (!dentry)
                 goto err;
-        }
 
         ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
         if (ret)
@@ -1632,17 +1861,16 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
 
         bool_dir = dentry;
 
+        ret = -ENOMEM;
         dentry = d_alloc_name(sb->s_root, NULL_FILE_NAME);
-        if (!dentry) {
-                ret = -ENOMEM;
+        if (!dentry)
                 goto err;
-        }
 
+        ret = -ENOMEM;
         inode = sel_make_inode(sb, S_IFCHR | S_IRUGO | S_IWUGO);
-        if (!inode) {
-                ret = -ENOMEM;
+        if (!inode)
                 goto err;
-        }
+
         inode->i_ino = ++sel_last_ino;
         isec = (struct inode_security_struct *)inode->i_security;
         isec->sid = SECINITSID_DEVNULL;
@@ -1653,11 +1881,10 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
         d_add(dentry, inode);
         selinux_null = dentry;
 
+        ret = -ENOMEM;
         dentry = d_alloc_name(sb->s_root, "avc");
-        if (!dentry) {
-                ret = -ENOMEM;
+        if (!dentry)
                 goto err;
-        }
 
         ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
         if (ret)
@@ -1667,11 +1894,10 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
         if (ret)
                 goto err;
 
+        ret = -ENOMEM;
         dentry = d_alloc_name(sb->s_root, "initial_contexts");
-        if (!dentry) {
-                ret = -ENOMEM;
+        if (!dentry)
                 goto err;
-        }
 
         ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
         if (ret)
@@ -1681,11 +1907,10 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
         if (ret)
                 goto err;
 
+        ret = -ENOMEM;
         dentry = d_alloc_name(sb->s_root, "class");
-        if (!dentry) {
-                ret = -ENOMEM;
+        if (!dentry)
                 goto err;
-        }
 
         ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
         if (ret)
@@ -1693,11 +1918,10 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
 
         class_dir = dentry;
 
+        ret = -ENOMEM;
         dentry = d_alloc_name(sb->s_root, "policy_capabilities");
-        if (!dentry) {
-                ret = -ENOMEM;
+        if (!dentry)
                 goto err;
-        }
 
         ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
         if (ret)
@@ -1705,28 +1929,27 @@ static int sel_fill_super(struct super_block *sb, void *data, int silent)
 
         policycap_dir = dentry;
 
-out:
-        return ret;
+        return 0;
 err:
         printk(KERN_ERR "SELinux: %s:  failed while creating inodes\n",
                 __func__);
-        goto out;
+        return ret;
 }
 
-static int sel_get_sb(struct file_system_type *fs_type,
-                      int flags, const char *dev_name, void *data,
-                      struct vfsmount *mnt)
+static struct dentry *sel_mount(struct file_system_type *fs_type,
+                      int flags, const char *dev_name, void *data)
 {
-        return get_sb_single(fs_type, flags, data, sel_fill_super, mnt);
+        return mount_single(fs_type, flags, data, sel_fill_super);
 }
 
 static struct file_system_type sel_fs_type = {
         .name           = "selinuxfs",
-        .get_sb         = sel_get_sb,
+        .mount          = sel_mount,
         .kill_sb        = kill_litter_super,
 };
 
 struct vfsmount *selinuxfs_mount;
+static struct kobject *selinuxfs_kobj;
 
 static int __init init_sel_fs(void)
 {
@@ -1734,15 +1957,24 @@ static int __init init_sel_fs(void)
 
         if (!selinux_enabled)
                 return 0;
+
+        selinuxfs_kobj = kobject_create_and_add("selinux", fs_kobj);
+        if (!selinuxfs_kobj)
+                return -ENOMEM;
+
         err = register_filesystem(&sel_fs_type);
-        if (!err) {
-                selinuxfs_mount = kern_mount(&sel_fs_type);
-                if (IS_ERR(selinuxfs_mount)) {
-                        printk(KERN_ERR "selinuxfs:  could not mount!\n");
-                        err = PTR_ERR(selinuxfs_mount);
-                        selinuxfs_mount = NULL;
-                }
+        if (err) {
+                kobject_put(selinuxfs_kobj);
+                return err;
         }
+
+        selinuxfs_mount = kern_mount(&sel_fs_type);
+        if (IS_ERR(selinuxfs_mount)) {
+                printk(KERN_ERR "selinuxfs:  could not mount!\n");
+                err = PTR_ERR(selinuxfs_mount);
+                selinuxfs_mount = NULL;
+        }
+
         return err;
 }
 
@@ -1751,6 +1983,7 @@ __initcall(init_sel_fs);
 #ifdef CONFIG_SECURITY_SELINUX_DISABLE
 void exit_sel_fs(void)
 {
+        kobject_put(selinuxfs_kobj);
         unregister_filesystem(&sel_fs_type);
 }
 #endif