SELinux: merge policydb_index_classes and policydb_index_others
[linux-2.6.git] / security / selinux / selinuxfs.c
index bab7b38..45d35e6 100644 (file)
@@ -1,11 +1,16 @@
 /* Updated: Karl MacMillan <kmacmillan@tresys.com>
  *
- *     Added conditional policy language extensions
+ *     Added conditional policy language extensions
  *
+ *  Updated: Hewlett-Packard <paul.moore@hp.com>
+ *
+ *     Added support for the policy capability bitmap
+ *
+ * Copyright (C) 2007 Hewlett-Packard Development Company, L.P.
  * Copyright (C) 2003 - 2004 Tresys Technology, LLC
  * Copyright (C) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
  *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
+ *     it under the terms of the GNU General Public License as published by
  *     the Free Software Foundation, version 2.
  */
 
@@ -22,8 +27,7 @@
 #include <linux/seq_file.h>
 #include <linux/percpu.h>
 #include <linux/audit.h>
-#include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/uaccess.h>
 
 /* selinuxfs pseudo filesystem for exporting the security policy API.
    Based on the proc code and the fs/nfsd/nfsctl.c code. */
 #include "objsec.h"
 #include "conditional.h"
 
-unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE;
-
-#ifdef CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT
-#define SELINUX_COMPAT_NET_VALUE 0
-#else
-#define SELINUX_COMPAT_NET_VALUE 1
-#endif
+/* Policy capability filenames */
+static char *policycap_names[] = {
+       "network_peer_controls",
+       "open_perms"
+};
 
-int selinux_compat_net = SELINUX_COMPAT_NET_VALUE;
+unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE;
 
 static int __init checkreqprot_setup(char *str)
 {
-       selinux_checkreqprot = simple_strtoul(str,NULL,0) ? 1 : 0;
+       unsigned long checkreqprot;
+       if (!strict_strtoul(str, 0, &checkreqprot))
+               selinux_checkreqprot = checkreqprot ? 1 : 0;
        return 1;
 }
 __setup("checkreqprot=", checkreqprot_setup);
 
-static int __init selinux_compat_net_setup(char *str)
-{
-       selinux_compat_net = simple_strtoul(str,NULL,0) ? 1 : 0;
-       return 1;
-}
-__setup("selinux_compat_net=", selinux_compat_net_setup);
-
-
 static DEFINE_MUTEX(sel_mutex);
 
 /* global data for booleans */
-static struct dentry *bool_dir = NULL;
-static int bool_num = 0;
-static int *bool_pending_values = NULL;
+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;
 
 extern void selnl_notify_setenforce(int val);
 
@@ -73,13 +79,18 @@ extern void selnl_notify_setenforce(int val);
 static int task_has_security(struct task_struct *tsk,
                             u32 perms)
 {
-       struct task_security_struct *tsec;
-
-       tsec = tsk->security;
+       const struct task_security_struct *tsec;
+       u32 sid = 0;
+
+       rcu_read_lock();
+       tsec = __task_cred(tsk)->security;
+       if (tsec)
+               sid = tsec->sid;
+       rcu_read_unlock();
        if (!tsec)
                return -EACCES;
 
-       return avc_has_perm(tsec->sid, SECINITSID_SECURITY,
+       return avc_has_perm(sid, SECINITSID_SECURITY,
                            SECCLASS_SECURITY, perms, NULL);
 }
 
@@ -96,12 +107,24 @@ enum sel_inos {
        SEL_COMMIT_BOOLS, /* commit new boolean values */
        SEL_MLS,        /* return if MLS policy is enabled */
        SEL_DISABLE,    /* disable SELinux until next reboot */
-       SEL_AVC,        /* AVC management directory */
        SEL_MEMBER,     /* compute polyinstantiation membership decision */
        SEL_CHECKREQPROT, /* check requested protection, not kernel-applied one */
        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 */
 };
 
+static unsigned long sel_last_ino = SEL_INO_NEXT - 1;
+
+#define SEL_INITCON_INO_OFFSET         0x01000000
+#define SEL_BOOL_INO_OFFSET            0x02000000
+#define SEL_CLASS_INO_OFFSET           0x04000000
+#define SEL_POLICYCAP_INO_OFFSET       0x08000000
+#define SEL_INO_MASK                   0x00ffffff
+
 #define TMPBUFLEN      12
 static ssize_t sel_read_enforce(struct file *filp, char __user *buf,
                                size_t count, loff_t *ppos)
@@ -114,23 +137,28 @@ static ssize_t sel_read_enforce(struct file *filp, char __user *buf,
 }
 
 #ifdef CONFIG_SECURITY_SELINUX_DEVELOP
-static ssize_t sel_write_enforce(struct file * file, const char __user * buf,
+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;
-       }
-       page = (char*)get_zeroed_page(GFP_KERNEL);
+               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;
@@ -144,13 +172,15 @@ static ssize_t sel_write_enforce(struct file * file, const char __user * buf,
                if (length)
                        goto out;
                audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
-                       "enforcing=%d old_enforcing=%d auid=%u", new_value, 
-                       selinux_enforcing,
-                       audit_get_loginuid(current->audit_context));
+                       "enforcing=%d old_enforcing=%d auid=%u ses=%u",
+                       new_value, selinux_enforcing,
+                       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);
        }
        length = count;
 out:
@@ -161,30 +191,107 @@ out:
 #define sel_write_enforce NULL
 #endif
 
-static struct file_operations sel_enforce_ops = {
+static const struct file_operations sel_enforce_ops = {
        .read           = sel_read_enforce,
        .write          = sel_write_enforce,
+       .llseek         = generic_file_llseek,
+};
+
+static ssize_t sel_read_handle_unknown(struct file *filp, char __user *buf,
+                                       size_t count, loff_t *ppos)
+{
+       char tmpbuf[TMPBUFLEN];
+       ssize_t length;
+       ino_t ino = filp->f_path.dentry->d_inode->i_ino;
+       int handle_unknown = (ino == SEL_REJECT_UNKNOWN) ?
+               security_get_reject_unknown() : !security_get_allow_unknown();
+
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%d", handle_unknown);
+       return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
+}
+
+static const struct file_operations sel_handle_unknown_ops = {
+       .read           = sel_read_handle_unknown,
+       .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,
+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;
-       }
-       page = (char*)get_zeroed_page(GFP_KERNEL);
+               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;
@@ -195,11 +302,12 @@ 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",
-                       audit_get_loginuid(current->audit_context));
+                       "selinux=0 auid=%u ses=%u",
+                       audit_get_loginuid(current),
+                       audit_get_sessionid(current));
        }
 
        length = count;
@@ -211,12 +319,13 @@ out:
 #define sel_write_disable NULL
 #endif
 
-static struct file_operations sel_disable_ops = {
+static const struct file_operations sel_disable_ops = {
        .write          = sel_write_disable,
+       .llseek         = generic_file_llseek,
 };
 
 static ssize_t sel_read_policyvers(struct file *filp, char __user *buf,
-                                   size_t count, loff_t *ppos)
+                                  size_t count, loff_t *ppos)
 {
        char tmpbuf[TMPBUFLEN];
        ssize_t length;
@@ -225,12 +334,19 @@ static ssize_t sel_read_policyvers(struct file *filp, char __user *buf,
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
-static struct file_operations sel_policyvers_ops = {
+static const struct file_operations sel_policyvers_ops = {
        .read           = sel_read_policyvers,
+       .llseek         = generic_file_llseek,
 };
 
 /* declaration for sel_write_load */
 static int sel_make_bools(void);
+static int sel_make_classes(void);
+static int sel_make_policycap(void);
+
+/* declaration for sel_make_class_dirs */
+static int sel_make_dir(struct inode *dir, struct dentry *dentry,
+                       unsigned long *ino);
 
 static ssize_t sel_read_mls(struct file *filp, char __user *buf,
                                size_t count, loff_t *ppos)
@@ -238,19 +354,155 @@ static ssize_t sel_read_mls(struct file *filp, char __user *buf,
        char tmpbuf[TMPBUFLEN];
        ssize_t length;
 
-       length = scnprintf(tmpbuf, TMPBUFLEN, "%d", selinux_mls_enabled);
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%d",
+                          security_mls_enabled());
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
-static struct file_operations sel_mls_ops = {
+static const struct file_operations sel_mls_ops = {
        .read           = sel_read_mls,
+       .llseek         = generic_file_llseek,
 };
 
-static ssize_t sel_write_load(struct file * file, const char __user * buf,
-                             size_t count, loff_t *ppos)
+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)
+
+{
        ssize_t length;
        void *data = NULL;
 
@@ -260,17 +512,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)
@@ -280,46 +534,58 @@ 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;
-       else
-               length = count;
+       length = sel_make_bools();
+       if (length)
+               goto out1;
+
+       length = sel_make_classes();
+       if (length)
+               goto out1;
+
+       length = sel_make_policycap();
+       if (length)
+               goto out1;
+
+       length = count;
+
+out1:
        audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,
-               "policy loaded auid=%u",
-               audit_get_loginuid(current->audit_context));
+               "policy loaded auid=%u ses=%u",
+               audit_get_loginuid(current),
+               audit_get_sessionid(current));
 out:
        mutex_unlock(&sel_mutex);
        vfree(data);
        return length;
 }
 
-static struct file_operations sel_load_ops = {
+static const struct file_operations sel_load_ops = {
        .write          = sel_write_load,
+       .llseek         = generic_file_llseek,
 };
 
-static ssize_t sel_write_context(struct file * file, char *buf, size_t size)
+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 "%s:  context size (%u) exceeds payload "
-                      "max\n", __FUNCTION__, len);
-               length = -ERANGE;
+               printk(KERN_ERR "SELinux: %s:  context size (%u) exceeds "
+                       "payload max\n", __func__, len);
                goto out;
        }
 
@@ -340,102 +606,59 @@ static ssize_t sel_read_checkreqprot(struct file *filp, char __user *buf,
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
-static ssize_t sel_write_checkreqprot(struct file * file, const 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;
-       }
-       page = (char*)get_zeroed_page(GFP_KERNEL);
-       if (!page)
-               return -ENOMEM;
-       length = -EFAULT;
-       if (copy_from_user(page, buf, count))
                goto out;
 
+       /* No partial writes. */
        length = -EINVAL;
-       if (sscanf(page, "%u", &new_value) != 1)
+       if (*ppos != 0)
                goto out;
 
-       selinux_checkreqprot = new_value ? 1 : 0;
-       length = count;
-out:
-       free_page((unsigned long) page);
-       return length;
-}
-static struct file_operations sel_checkreqprot_ops = {
-       .read           = sel_read_checkreqprot,
-       .write          = sel_write_checkreqprot,
-};
-
-static ssize_t sel_read_compat_net(struct file *filp, char __user *buf,
-                                  size_t count, loff_t *ppos)
-{
-       char tmpbuf[TMPBUFLEN];
-       ssize_t length;
-
-       length = scnprintf(tmpbuf, TMPBUFLEN, "%d", selinux_compat_net);
-       return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
-}
-
-static ssize_t sel_write_compat_net(struct file * file, const char __user * buf,
-                                   size_t count, loff_t *ppos)
-{
-       char *page;
-       ssize_t length;
-       int new_value;
-
-       length = task_has_security(current, SECURITY__LOAD_POLICY);
-       if (length)
-               return length;
-
-       if (count >= PAGE_SIZE)
-               return -ENOMEM;
-       if (*ppos != 0) {
-               /* No partial writes. */
-               return -EINVAL;
-       }
-       page = (char*)get_zeroed_page(GFP_KERNEL);
+       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;
 
        length = -EINVAL;
-       if (sscanf(page, "%d", &new_value) != 1)
+       if (sscanf(page, "%u", &new_value) != 1)
                goto out;
 
-       selinux_compat_net = new_value ? 1 : 0;
+       selinux_checkreqprot = new_value ? 1 : 0;
        length = count;
 out:
        free_page((unsigned long) page);
        return length;
 }
-static struct file_operations sel_compat_net_ops = {
-       .read           = sel_read_compat_net,
-       .write          = sel_write_compat_net,
+static const struct file_operations sel_checkreqprot_ops = {
+       .read           = sel_read_checkreqprot,
+       .write          = sel_write_checkreqprot,
+       .llseek         = generic_file_llseek,
 };
 
 /*
  * Remaining nodes use transaction based IO methods like nfsd/nfsctl.c
  */
-static ssize_t sel_write_access(struct file * file, char *buf, size_t size);
-static ssize_t sel_write_create(struct file * file, char *buf, size_t size);
-static ssize_t sel_write_relabel(struct file * file, char *buf, size_t size);
-static ssize_t sel_write_user(struct file * file, char *buf, size_t size);
-static ssize_t sel_write_member(struct file * file, char *buf, size_t size);
+static ssize_t sel_write_access(struct file *file, char *buf, size_t size);
+static ssize_t sel_write_create(struct file *file, char *buf, size_t size);
+static ssize_t sel_write_relabel(struct file *file, char *buf, size_t size);
+static ssize_t sel_write_user(struct file *file, char *buf, size_t size);
+static ssize_t sel_write_member(struct file *file, char *buf, size_t size);
 
 static ssize_t (*write_op[])(struct file *, char *, size_t) = {
        [SEL_ACCESS] = sel_write_access,
@@ -448,7 +671,7 @@ static ssize_t (*write_op[])(struct file *, char *, size_t) = {
 
 static ssize_t selinux_transaction_write(struct file *file, const char __user *buf, size_t size, loff_t *pos)
 {
-       ino_t ino =  file->f_dentry->d_inode->i_ino;
+       ino_t ino = file->f_path.dentry->d_inode->i_ino;
        char *data;
        ssize_t rv;
 
@@ -459,18 +682,19 @@ static ssize_t selinux_transaction_write(struct file *file, const char __user *b
        if (IS_ERR(data))
                return PTR_ERR(data);
 
-       rv =  write_op[ino](file, data, size);
-       if (rv>0) {
+       rv = write_op[ino](file, data, size);
+       if (rv > 0) {
                simple_transaction_set(file, rv);
                rv = size;
        }
        return rv;
 }
 
-static struct file_operations transaction_ops = {
+static const struct file_operations transaction_ops = {
        .write          = selinux_transaction_write,
        .read           = simple_transaction_read,
        .release        = simple_transaction_release,
+       .llseek         = generic_file_llseek,
 };
 
 /*
@@ -479,175 +703,172 @@ static struct file_operations transaction_ops = {
  * and the length returned.  Otherwise return 0 or and -error.
  */
 
-static ssize_t sel_write_access(struct file * file, char *buf, size_t size)
+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;
-       u32 req;
        struct av_decision avd;
        ssize_t length;
 
        length = task_has_security(current, SECURITY__COMPUTE_AV);
        if (length)
-               return length;
+               goto out;
 
        length = -ENOMEM;
-       scon = kzalloc(size+1, GFP_KERNEL);
+       scon = kzalloc(size + 1, GFP_KERNEL);
        if (!scon)
-               return length;
+               goto out;
 
-       tcon = kzalloc(size+1, GFP_KERNEL);
+       length = -ENOMEM;
+       tcon = kzalloc(size + 1, GFP_KERNEL);
        if (!tcon)
                goto out;
 
        length = -EINVAL;
-       if (sscanf(buf, "%s %s %hu %x", scon, tcon, &tclass, &req) != 4)
-               goto out2;
+       if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
+               goto out;
 
-       length = security_context_to_sid(scon, strlen(scon)+1, &ssid);
-       if (length < 0)
-               goto out2;
-       length = security_context_to_sid(tcon, strlen(tcon)+1, &tsid);
-       if (length < 0)
-               goto out2;
+       length = security_context_to_sid(scon, strlen(scon) + 1, &ssid);
+       if (length)
+               goto out;
 
-       length = security_compute_av(ssid, tsid, tclass, req, &avd);
-       if (length < 0)
-               goto out2;
+       length = security_context_to_sid(tcon, strlen(tcon) + 1, &tsid);
+       if (length)
+               goto out;
+
+       security_compute_av_user(ssid, tsid, tclass, &avd);
 
        length = scnprintf(buf, SIMPLE_TRANSACTION_LIMIT,
-                         "%x %x %x %x %u",
-                         avd.allowed, avd.decided,
+                         "%x %x %x %x %u %x",
+                         avd.allowed, 0xffffffff,
                          avd.auditallow, avd.auditdeny,
-                         avd.seqno);
-out2:
-       kfree(tcon);
+                         avd.seqno, avd.flags);
 out:
+       kfree(tcon);
        kfree(scon);
        return length;
 }
 
-static ssize_t sel_write_create(struct file * file, char *buf, size_t size)
+static ssize_t sel_write_create(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_CREATE);
        if (length)
-               return length;
+               goto out;
 
        length = -ENOMEM;
-       scon = kzalloc(size+1, GFP_KERNEL);
+       scon = kzalloc(size + 1, GFP_KERNEL);
        if (!scon)
-               return length;
+               goto out;
 
-       tcon = kzalloc(size+1, GFP_KERNEL);
+       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;
-       length = security_context_to_sid(tcon, strlen(tcon)+1, &tsid);
-       if (length < 0)
-               goto out2;
+       length = security_context_to_sid(scon, strlen(scon) + 1, &ssid);
+       if (length)
+               goto out;
+
+       length = security_context_to_sid(tcon, strlen(tcon) + 1, &tsid);
+       if (length)
+               goto out;
 
-       length = security_transition_sid(ssid, tsid, tclass, &newsid);
-       if (length < 0)
-               goto out2;
+       length = security_transition_sid_user(ssid, tsid, tclass, &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 "%s:  context size (%u) exceeds payload "
-                      "max\n", __FUNCTION__, len);
-               length = -ERANGE;
-               goto out3;
+               printk(KERN_ERR "SELinux: %s:  context size (%u) exceeds "
+                       "payload max\n", __func__, len);
+               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_relabel(struct file * file, char *buf, size_t size)
+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);
+       scon = kzalloc(size + 1, GFP_KERNEL);
        if (!scon)
-               return length;
+               goto out;
 
-       tcon = kzalloc(size+1, GFP_KERNEL);
+       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)
+               goto out;
 
-       length = security_context_to_sid(scon, strlen(scon)+1, &ssid);
-       if (length < 0)
-               goto out2;
-       length = security_context_to_sid(tcon, strlen(tcon)+1, &tsid);
-       if (length < 0)
-               goto out2;
+       length = security_context_to_sid(tcon, strlen(tcon) + 1, &tsid);
+       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)
+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;
@@ -655,28 +876,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);
+       con = kzalloc(size + 1, GFP_KERNEL);
        if (!con)
-               return length;
+               goto out;;
 
-       user = kzalloc(size+1, GFP_KERNEL);
+       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;
+       length = security_context_to_sid(con, strlen(con) + 1, &sid);
+       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;
@@ -684,82 +906,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)
+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);
+       scon = kzalloc(size + 1, GFP_KERNEL);
        if (!scon)
-               return length;
+               goto out;;
 
-       tcon = kzalloc(size+1, GFP_KERNEL);
+       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;
-       length = security_context_to_sid(tcon, strlen(tcon)+1, &tsid);
-       if (length < 0)
-               goto out2;
+       length = security_context_to_sid(scon, strlen(scon) + 1, &ssid);
+       if (length)
+               goto out;
+
+       length = security_context_to_sid(tcon, strlen(tcon) + 1, &tsid);
+       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 "%s:  context size (%u) exceeds payload "
-                      "max\n", __FUNCTION__, len);
-               length = -ERANGE;
-               goto out3;
+               printk(KERN_ERR "SELinux: %s:  context size (%u) exceeds "
+                       "payload max\n", __func__, len);
+               goto out;
        }
 
        memcpy(buf, newcon, len);
        length = len;
-out3:
+out:
        kfree(newcon);
-out2:
        kfree(tcon);
-out:
        kfree(scon);
        return length;
 }
@@ -770,15 +990,11 @@ static struct inode *sel_make_inode(struct super_block *sb, int mode)
 
        if (ret) {
                ret->i_mode = mode;
-               ret->i_uid = ret->i_gid = 0;
-               ret->i_blocks = 0;
                ret->i_atime = ret->i_mtime = ret->i_ctime = CURRENT_TIME;
        }
        return ret;
 }
 
-#define BOOL_INO_OFFSET 30
-
 static ssize_t sel_read_bool(struct file *filep, char __user *buf,
                             size_t count, loff_t *ppos)
 {
@@ -786,39 +1002,32 @@ static ssize_t sel_read_bool(struct file *filep, char __user *buf,
        ssize_t length;
        ssize_t ret;
        int cur_enforcing;
-       struct inode *inode;
+       struct inode *inode = filep->f_path.dentry->d_inode;
+       unsigned index = inode->i_ino & SEL_INO_MASK;
+       const char *name = filep->f_path.dentry->d_name.name;
 
        mutex_lock(&sel_mutex);
 
-       ret = -EFAULT;
-
-       /* check to see if this file has been deleted */
-       if (!filep->f_op)
+       ret = -EINVAL;
+       if (index >= bool_num || strcmp(name, bool_pending_names[index]))
                goto out;
 
-       if (count > PAGE_SIZE) {
-               ret = -EINVAL;
-               goto out;
-       }
-       if (!(page = (char*)get_zeroed_page(GFP_KERNEL))) {
-               ret = -ENOMEM;
+       ret = -ENOMEM;
+       page = (char *)get_zeroed_page(GFP_KERNEL);
+       if (!page)
                goto out;
-       }
 
-       inode = filep->f_dentry->d_inode;
-       cur_enforcing = security_get_bool_value(inode->i_ino - BOOL_INO_OFFSET);
+       cur_enforcing = security_get_bool_value(index);
        if (cur_enforcing < 0) {
                ret = cur_enforcing;
                goto out;
        }
-
        length = scnprintf(page, PAGE_SIZE, "%d %d", cur_enforcing,
-                         bool_pending_values[inode->i_ino - BOOL_INO_OFFSET]);
+                         bool_pending_values[index]);
        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;
 }
 
@@ -826,9 +1035,11 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
                              size_t count, loff_t *ppos)
 {
        char *page = NULL;
-       ssize_t length = -EFAULT;
+       ssize_t length;
        int new_value;
-       struct inode *inode;
+       struct inode *inode = filep->f_path.dentry->d_inode;
+       unsigned index = inode->i_ino & SEL_INO_MASK;
+       const char *name = filep->f_path.dentry->d_name.name;
 
        mutex_lock(&sel_mutex);
 
@@ -836,24 +1047,25 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
        if (length)
                goto out;
 
-       /* check to see if this file has been deleted */
-       if (!filep->f_op)
+       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. */
+
+       /* No partial writes. */
+       length = -EINVAL;
+       if (*ppos != 0)
                goto out;
-       }
-       page = (char*)get_zeroed_page(GFP_KERNEL);
-       if (!page) {
-               length = -ENOMEM;
+
+       length = -ENOMEM;
+       page = (char *)get_zeroed_page(GFP_KERNEL);
+       if (!page)
                goto out;
-       }
 
+       length = -EFAULT;
        if (copy_from_user(page, buf, count))
                goto out;
 
@@ -864,20 +1076,19 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
        if (new_value)
                new_value = 1;
 
-       inode = filep->f_dentry->d_inode;
-       bool_pending_values[inode->i_ino - BOOL_INO_OFFSET] = new_value;
+       bool_pending_values[index] = new_value;
        length = count;
 
 out:
        mutex_unlock(&sel_mutex);
-       if (page)
-               free_page((unsigned long) page);
+       free_page((unsigned long) page);
        return length;
 }
 
-static struct file_operations sel_bool_ops = {
-       .read           = sel_read_bool,
-       .write          = sel_write_bool,
+static const struct file_operations sel_bool_ops = {
+       .read           = sel_read_bool,
+       .write          = sel_write_bool,
+       .llseek         = generic_file_llseek,
 };
 
 static ssize_t sel_commit_bools_write(struct file *filep,
@@ -885,7 +1096,7 @@ static ssize_t sel_commit_bools_write(struct file *filep,
                                      size_t count, loff_t *ppos)
 {
        char *page = NULL;
-       ssize_t length = -EFAULT;
+       ssize_t length;
        int new_value;
 
        mutex_lock(&sel_mutex);
@@ -894,24 +1105,21 @@ static ssize_t sel_commit_bools_write(struct file *filep,
        if (length)
                goto out;
 
-       /* check to see if this file has been deleted */
-       if (!filep->f_op)
+       length = -ENOMEM;
+       if (count >= PAGE_SIZE)
                goto out;
 
-       if (count >= PAGE_SIZE) {
-               length = -ENOMEM;
-               goto out;
-       }
-       if (*ppos != 0) {
-               /* No partial writes. */
+       /* No partial writes. */
+       length = -EINVAL;
+       if (*ppos != 0)
                goto out;
-       }
-       page = (char*)get_zeroed_page(GFP_KERNEL);
-       if (!page) {
-               length = -ENOMEM;
+
+       length = -ENOMEM;
+       page = (char *)get_zeroed_page(GFP_KERNEL);
+       if (!page)
                goto out;
-       }
 
+       length = -EFAULT;
        if (copy_from_user(page, buf, count))
                goto out;
 
@@ -919,29 +1127,27 @@ static ssize_t sel_commit_bools_write(struct file *filep,
        if (sscanf(page, "%d", &new_value) != 1)
                goto out;
 
-       if (new_value && bool_pending_values) {
-               security_set_bools(bool_num, bool_pending_values);
-       }
+       length = 0;
+       if (new_value && 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;
 }
 
-static struct file_operations sel_commit_bools_ops = {
-       .write          = sel_commit_bools_write,
+static const struct file_operations sel_commit_bools_ops = {
+       .write          = sel_commit_bools_write,
+       .llseek         = generic_file_llseek,
 };
 
-/* delete booleans - partial revoke() from
- * fs/proc/generic.c proc_kill_inodes */
-static void sel_remove_bools(struct dentry *de)
+static void sel_remove_entries(struct dentry *de)
 {
-       struct list_head *p, *node;
-       struct super_block *sb = de->d_sb;
+       struct list_head *node;
 
        spin_lock(&dcache_lock);
        node = de->d_subdirs.next;
@@ -961,25 +1167,13 @@ static void sel_remove_bools(struct dentry *de)
        }
 
        spin_unlock(&dcache_lock);
-
-       file_list_lock();
-       list_for_each(p, &sb->s_files) {
-               struct file * filp = list_entry(p, struct file, f_u.fu_list);
-               struct dentry * dentry = filp->f_dentry;
-
-               if (dentry->d_parent != de) {
-                       continue;
-               }
-               filp->f_op = NULL;
-       }
-       file_list_unlock();
 }
 
 #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;
@@ -991,67 +1185,78 @@ 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_pending_names = NULL;
        bool_pending_values = NULL;
 
-       sel_remove_bools(dir);
+       sel_remove_entries(dir);
 
-       if (!(page = (char*)get_zeroed_page(GFP_KERNEL)))
-               return -ENOMEM;
+       ret = -ENOMEM;
+       page = (char *)get_zeroed_page(GFP_KERNEL);
+       if (!page)
+               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;
-               }
-               isec = (struct inode_security_struct*)inode->i_security;
-               if ((ret = security_genfs_sid("selinuxfs", page, SECCLASS_FILE, &sid)))
-                       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 out;
+
                isec->sid = sid;
                isec->initialized = 1;
                inode->i_fop = &sel_bool_ops;
-               inode->i_ino = i + BOOL_INO_OFFSET;
+               inode->i_ino = i|SEL_BOOL_INO_OFFSET;
                d_add(dentry, inode);
        }
        bool_num = num;
+       bool_pending_names = names;
        bool_pending_values = values;
+
+       free_page((unsigned long)page);
+       return 0;
 out:
        free_page((unsigned long)page);
+
        if (names) {
                for (i = 0; i < num; i++)
                        kfree(names[i]);
                kfree(names);
        }
-       return ret;
-err:
        kfree(values);
-       sel_remove_bools(dir);
-       ret = -ENOMEM;
-       goto out;
+       sel_remove_entries(dir);
+
+       return ret;
 }
 
 #define NULL_FILE_NAME "null"
 
-struct dentry *selinux_null = NULL;
+struct dentry *selinux_null;
 
 static ssize_t sel_read_avc_cache_threshold(struct file *filp, char __user *buf,
                                            size_t count, loff_t *ppos)
@@ -1063,52 +1268,46 @@ static ssize_t sel_read_avc_cache_threshold(struct file *filp, char __user *buf,
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
-static ssize_t sel_write_avc_cache_threshold(struct file * file,
-                                            const char __user * buf,
+static ssize_t sel_write_avc_cache_threshold(struct file *file,
+                                            const char __user *buf,
                                             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;
-       }
 
-       page = (char*)get_zeroed_page(GFP_KERNEL);
-       if (!page) {
-               ret = -ENOMEM;
+       /* No partial writes. */
+       ret = -EINVAL;
+       if (*ppos != 0)
                goto out;
-       }
 
-       if (copy_from_user(page, buf, count)) {
-               ret = -EFAULT;
-               goto out_free;
-       }
+       ret = -ENOMEM;
+       page = (char *)get_zeroed_page(GFP_KERNEL);
+       if (!page)
+               goto out;
 
-       if (sscanf(page, "%u", &new_value) != 1) {
-               ret = -EINVAL;
+       ret = -EFAULT;
+       if (copy_from_user(page, buf, count))
                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;
-       }
+       ret = -EINVAL;
+       if (sscanf(page, "%u", &new_value) != 1)
+               goto out;
+
+       avc_cache_threshold = new_value;
+
        ret = count;
-out_free:
-       free_page((unsigned long)page);
 out:
+       free_page((unsigned long)page);
        return ret;
 }
 
@@ -1116,28 +1315,29 @@ 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 struct file_operations sel_avc_cache_threshold_ops = {
+static const struct file_operations sel_avc_cache_threshold_ops = {
        .read           = sel_read_avc_cache_threshold,
        .write          = sel_write_avc_cache_threshold,
+       .llseek         = generic_file_llseek,
 };
 
-static struct file_operations sel_avc_hash_stats_ops = {
+static const struct file_operations sel_avc_hash_stats_ops = {
        .read           = sel_read_avc_hash_stats,
+       .llseek         = generic_file_llseek,
 };
 
 #ifdef CONFIG_SECURITY_SELINUX_AVC_STATS
@@ -1145,7 +1345,7 @@ static struct avc_cache_stats *sel_avc_get_stat_idx(loff_t *idx)
 {
        int cpu;
 
-       for (cpu = *idx; cpu < NR_CPUS; ++cpu) {
+       for (cpu = *idx; cpu < nr_cpu_ids; ++cpu) {
                if (!cpu_possible(cpu))
                        continue;
                *idx = cpu + 1;
@@ -1186,7 +1386,7 @@ static int sel_avc_stats_seq_show(struct seq_file *seq, void *v)
 static void sel_avc_stats_seq_stop(struct seq_file *seq, void *v)
 { }
 
-static struct seq_operations sel_avc_cache_stats_seq_ops = {
+static const struct seq_operations sel_avc_cache_stats_seq_ops = {
        .start          = sel_avc_stats_seq_start,
        .next           = sel_avc_stats_seq_next,
        .show           = sel_avc_stats_seq_show,
@@ -1198,7 +1398,7 @@ static int sel_open_avc_cache_stats(struct inode *inode, struct file *file)
        return seq_open(file, &sel_avc_cache_stats_seq_ops);
 }
 
-static struct file_operations sel_avc_cache_stats_ops = {
+static const struct file_operations sel_avc_cache_stats_ops = {
        .open           = sel_open_avc_cache_stats,
        .read           = seq_read,
        .llseek         = seq_lseek,
@@ -1208,7 +1408,7 @@ static 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 },
@@ -1223,45 +1423,345 @@ 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 0;
+}
+
+static ssize_t sel_read_initcon(struct file *file, char __user *buf,
+                               size_t count, loff_t *ppos)
+{
+       struct inode *inode;
+       char *con;
+       u32 sid, len;
+       ssize_t ret;
+
+       inode = file->f_path.dentry->d_inode;
+       sid = inode->i_ino&SEL_INO_MASK;
+       ret = security_sid_to_context(sid, &con, &len);
+       if (ret)
+               return ret;
+
+       ret = simple_read_from_buffer(buf, count, ppos, con, len);
+       kfree(con);
        return ret;
 }
 
-static int sel_make_dir(struct inode *dir, struct dentry *dentry)
+static const struct file_operations sel_initcon_ops = {
+       .read           = sel_read_initcon,
+       .llseek         = generic_file_llseek,
+};
+
+static int sel_make_initcon_files(struct dentry *dir)
+{
+       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)
+                       return -ENOMEM;
+
+               inode = sel_make_inode(dir->d_sb, S_IFREG|S_IRUGO);
+               if (!inode)
+                       return -ENOMEM;
+
+               inode->i_fop = &sel_initcon_ops;
+               inode->i_ino = i|SEL_INITCON_INO_OFFSET;
+               d_add(dentry, inode);
+       }
+
+       return 0;
+}
+
+static inline unsigned int sel_div(unsigned long a, unsigned long b)
+{
+       return a / b - (a % b < 0);
+}
+
+static inline unsigned long sel_class_to_ino(u16 class)
+{
+       return (class * (SEL_VEC_MAX + 1)) | SEL_CLASS_INO_OFFSET;
+}
+
+static inline u16 sel_ino_to_class(unsigned long ino)
+{
+       return sel_div(ino & SEL_INO_MASK, SEL_VEC_MAX + 1);
+}
+
+static inline unsigned long sel_perm_to_ino(u16 class, u32 perm)
+{
+       return (class * (SEL_VEC_MAX + 1) + perm) | SEL_CLASS_INO_OFFSET;
+}
+
+static inline u32 sel_ino_to_perm(unsigned long ino)
+{
+       return (ino & SEL_INO_MASK) % (SEL_VEC_MAX + 1);
+}
+
+static ssize_t sel_read_class(struct file *file, char __user *buf,
+                               size_t count, loff_t *ppos)
+{
+       ssize_t rc, len;
+       char *page;
+       unsigned long ino = file->f_path.dentry->d_inode->i_ino;
+
+       page = (char *)__get_free_page(GFP_KERNEL);
+       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);
+
+       return rc;
+}
+
+static const struct file_operations sel_class_ops = {
+       .read           = sel_read_class,
+       .llseek         = generic_file_llseek,
+};
+
+static ssize_t sel_read_perm(struct file *file, char __user *buf,
+                               size_t count, loff_t *ppos)
+{
+       ssize_t rc, len;
+       char *page;
+       unsigned long ino = file->f_path.dentry->d_inode->i_ino;
+
+       page = (char *)__get_free_page(GFP_KERNEL);
+       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);
+
+       return rc;
+}
+
+static const struct file_operations sel_perm_ops = {
+       .read           = sel_read_perm,
+       .llseek         = generic_file_llseek,
+};
+
+static ssize_t sel_read_policycap(struct file *file, char __user *buf,
+                                 size_t count, loff_t *ppos)
+{
+       int value;
+       char tmpbuf[TMPBUFLEN];
+       ssize_t length;
+       unsigned long i_ino = file->f_path.dentry->d_inode->i_ino;
+
+       value = security_policycap_supported(i_ino & SEL_INO_MASK);
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%d", value);
+
+       return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
+}
+
+static const struct file_operations sel_policycap_ops = {
+       .read           = sel_read_policycap,
+       .llseek         = generic_file_llseek,
+};
+
+static int sel_make_perm_files(char *objclass, int classvalue,
+                               struct dentry *dir)
+{
+       int i, rc, nperms;
+       char **perms;
+
+       rc = security_get_permissions(objclass, &perms, &nperms);
+       if (rc)
+               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)
+                       goto out;
+
+               rc = -ENOMEM;
+               inode = sel_make_inode(dir->d_sb, S_IFREG|S_IRUGO);
+               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);
+       }
+       rc = 0;
+out:
+       for (i = 0; i < nperms; i++)
+               kfree(perms[i]);
+       kfree(perms);
+       return rc;
+}
+
+static int sel_make_class_dir_entries(char *classname, int index,
+                                       struct dentry *dir)
+{
+       struct dentry *dentry = NULL;
+       struct inode *inode = NULL;
+       int rc;
+
+       dentry = d_alloc_name(dir, "index");
+       if (!dentry)
+               return -ENOMEM;
+
+       inode = sel_make_inode(dir->d_sb, S_IFREG|S_IRUGO);
+       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)
+               return -ENOMEM;
+
+       rc = sel_make_dir(dir->d_inode, dentry, &last_class_ino);
+       if (rc)
+               return rc;
+
+       rc = sel_make_perm_files(classname, index, dentry);
+
+       return rc;
+}
+
+static void sel_remove_classes(void)
+{
+       struct list_head *class_node;
+
+       list_for_each(class_node, &class_dir->d_subdirs) {
+               struct dentry *class_subdir = list_entry(class_node,
+                                       struct dentry, d_u.d_child);
+               struct list_head *class_subdir_node;
+
+               list_for_each(class_subdir_node, &class_subdir->d_subdirs) {
+                       struct dentry *d = list_entry(class_subdir_node,
+                                               struct dentry, d_u.d_child);
+
+                       if (d->d_inode)
+                               if (d->d_inode->i_mode & S_IFDIR)
+                                       sel_remove_entries(d);
+               }
+
+               sel_remove_entries(class_subdir);
+       }
+
+       sel_remove_entries(class_dir);
+}
+
+static int sel_make_classes(void)
+{
+       int rc, nclasses, i;
+       char **classes;
+
+       /* delete any existing entries */
+       sel_remove_classes();
+
+       rc = security_get_classes(&classes, &nclasses);
+       if (rc)
+               return rc;
+
+       /* +2 since classes are 1-indexed */
+       last_class_ino = sel_class_to_ino(nclasses + 2);
+
+       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)
+                       goto out;
+
+               rc = sel_make_dir(class_dir->d_inode, class_name_dir,
+                               &last_class_ino);
+               if (rc)
+                       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 out;
+       }
+       rc = 0;
+out:
+       for (i = 0; i < nclasses; i++)
+               kfree(classes[i]);
+       kfree(classes);
+       return rc;
+}
+
+static int sel_make_policycap(void)
+{
+       unsigned int iter;
+       struct dentry *dentry = NULL;
+       struct inode *inode = NULL;
+
+       sel_remove_entries(policycap_dir);
+
+       for (iter = 0; iter <= POLICYDB_CAPABILITY_MAX; iter++) {
+               if (iter < ARRAY_SIZE(policycap_names))
+                       dentry = d_alloc_name(policycap_dir,
+                                             policycap_names[iter]);
+               else
+                       dentry = d_alloc_name(policycap_dir, "unknown");
+
+               if (dentry == NULL)
+                       return -ENOMEM;
+
+               inode = sel_make_inode(policycap_dir->d_sb, S_IFREG | S_IRUGO);
+               if (inode == NULL)
+                       return -ENOMEM;
+
+               inode->i_fop = &sel_policycap_ops;
+               inode->i_ino = iter | SEL_POLICYCAP_INO_OFFSET;
+               d_add(dentry, inode);
+       }
+
+       return 0;
+}
+
+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);
        /* directory inodes start off with i_nlink == 2 (for "." entry) */
-       inode->i_nlink++;
+       inc_nlink(inode);
        d_add(dentry, inode);
        /* bump link count on parent directory, too */
-       dir->i_nlink++;
-out:
-       return ret;
+       inc_nlink(dir);
+
+       return 0;
 }
 
-static int sel_fill_super(struct super_block * sb, void * data, int silent)
+static int sel_fill_super(struct super_block *sb, void *data, int silent)
 {
        int ret;
        struct dentry *dentry;
@@ -1282,7 +1782,10 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
                [SEL_DISABLE] = {"disable", &sel_disable_ops, S_IWUSR},
                [SEL_MEMBER] = {"member", &transaction_ops, S_IRUGO|S_IWUGO},
                [SEL_CHECKREQPROT] = {"checkreqprot", &sel_checkreqprot_ops, S_IRUGO|S_IWUSR},
-               [SEL_COMPAT_NET] = {"compat_net", &sel_compat_net_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);
@@ -1291,30 +1794,29 @@ 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);
+       ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
        if (ret)
                goto err;
 
        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;
-       }
-       isec = (struct inode_security_struct*)inode->i_security;
+
+       inode->i_ino = ++sel_last_ino;
+       isec = (struct inode_security_struct *)inode->i_security;
        isec->sid = SECINITSID_DEVNULL;
        isec->sclass = SECCLASS_CHR_FILE;
        isec->initialized = 1;
@@ -1323,36 +1825,70 @@ 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);
+       ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
        if (ret)
                goto err;
 
        ret = sel_make_avc_files(dentry);
        if (ret)
                goto err;
-out:
-       return ret;
+
+       ret = -ENOMEM;
+       dentry = d_alloc_name(sb->s_root, "initial_contexts");
+       if (!dentry)
+               goto err;
+
+       ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
+       if (ret)
+               goto err;
+
+       ret = sel_make_initcon_files(dentry);
+       if (ret)
+               goto err;
+
+       ret = -ENOMEM;
+       dentry = d_alloc_name(sb->s_root, "class");
+       if (!dentry)
+               goto err;
+
+       ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
+       if (ret)
+               goto err;
+
+       class_dir = dentry;
+
+       ret = -ENOMEM;
+       dentry = d_alloc_name(sb->s_root, "policy_capabilities");
+       if (!dentry)
+               goto err;
+
+       ret = sel_make_dir(root_inode, dentry, &sel_last_ino);
+       if (ret)
+               goto err;
+
+       policycap_dir = dentry;
+
+       return 0;
 err:
-       printk(KERN_ERR "%s:  failed while creating inodes\n", __FUNCTION__);
-       goto out;
+       printk(KERN_ERR "SELinux: %s:  failed while creating inodes\n",
+               __func__);
+       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,
 };
 
@@ -1365,14 +1901,16 @@ static int __init init_sel_fs(void)
        if (!selinux_enabled)
                return 0;
        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)
+               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;
 }