Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git] / security / selinux / selinuxfs.c
index 975a177..a4efc96 100644 (file)
@@ -3,6 +3,7 @@
  *     Added conditional policy language extensions
  *
  * 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
  *     the Free Software Foundation, version 2.
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
+#include <linux/mutex.h>
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/security.h>
+#include <linux/major.h>
+#include <linux/seq_file.h>
+#include <linux/percpu.h>
+#include <linux/audit.h>
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>
 
 #include "objsec.h"
 #include "conditional.h"
 
-static DECLARE_MUTEX(sel_sem);
+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;
+       return 1;
+}
+__setup("checkreqprot=", checkreqprot_setup);
+
+
+static DEFINE_MUTEX(sel_mutex);
 
 /* global data for booleans */
 static struct dentry *bool_dir = NULL;
@@ -40,8 +56,8 @@ static int *bool_pending_values = NULL;
 extern void selnl_notify_setenforce(int val);
 
 /* Check whether a task is allowed to use a security operation. */
-int task_has_security(struct task_struct *tsk,
-                     u32 perms)
+static int task_has_security(struct task_struct *tsk,
+                            u32 perms)
 {
        struct task_security_struct *tsec;
 
@@ -50,7 +66,7 @@ int task_has_security(struct task_struct *tsk,
                return -EACCES;
 
        return avc_has_perm(tsec->sid, SECINITSID_SECURITY,
-                           SECCLASS_SECURITY, perms, NULL, NULL);
+                           SECCLASS_SECURITY, perms, NULL);
 }
 
 enum sel_inos {
@@ -65,43 +81,21 @@ enum sel_inos {
        SEL_POLICYVERS, /* return policy version for this kernel */
        SEL_COMMIT_BOOLS, /* commit new boolean values */
        SEL_MLS,        /* return if MLS policy is enabled */
-       SEL_DISABLE     /* disable SELinux until next reboot */
+       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 */
 };
 
+#define TMPBUFLEN      12
 static ssize_t sel_read_enforce(struct file *filp, char __user *buf,
                                size_t count, loff_t *ppos)
 {
-       char *page;
+       char tmpbuf[TMPBUFLEN];
        ssize_t length;
-       ssize_t end;
 
-       if (count < 0 || count > PAGE_SIZE)
-               return -EINVAL;
-       if (!(page = (char*)__get_free_page(GFP_KERNEL)))
-               return -ENOMEM;
-       memset(page, 0, PAGE_SIZE);
-
-       length = scnprintf(page, PAGE_SIZE, "%d", selinux_enforcing);
-       if (length < 0) {
-               free_page((unsigned long)page);
-               return length;
-       }
-
-       if (*ppos >= length) {
-               free_page((unsigned long)page);
-               return 0;
-       }
-       if (count + *ppos > length)
-               count = length - *ppos;
-       end = count + *ppos;
-       if (copy_to_user(buf, (char *) page + *ppos, count)) {
-               count = -EFAULT;
-               goto out;
-       }
-       *ppos = end;
-out:
-       free_page((unsigned long)page);
-       return count;
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%d", selinux_enforcing);
+       return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
 #ifdef CONFIG_SECURITY_SELINUX_DEVELOP
@@ -113,16 +107,15 @@ static ssize_t sel_write_enforce(struct file * file, const char __user * buf,
        ssize_t length;
        int new_value;
 
-       if (count < 0 || count >= PAGE_SIZE)
+       if (count >= PAGE_SIZE)
                return -ENOMEM;
        if (*ppos != 0) {
                /* No partial writes. */
                return -EINVAL;
        }
-       page = (char*)__get_free_page(GFP_KERNEL);
+       page = (char*)get_zeroed_page(GFP_KERNEL);
        if (!page)
                return -ENOMEM;
-       memset(page, 0, PAGE_SIZE);
        length = -EFAULT;
        if (copy_from_user(page, buf, count))
                goto out;
@@ -135,6 +128,10 @@ static ssize_t sel_write_enforce(struct file * file, const char __user * buf,
                length = task_has_security(current, SECURITY__SETENFORCE);
                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));
                selinux_enforcing = new_value;
                if (selinux_enforcing)
                        avc_ss_reset(0);
@@ -164,16 +161,15 @@ static ssize_t sel_write_disable(struct file * file, const char __user * buf,
        int new_value;
        extern int selinux_disable(void);
 
-       if (count < 0 || count >= PAGE_SIZE)
+       if (count >= PAGE_SIZE)
                return -ENOMEM;
        if (*ppos != 0) {
                /* No partial writes. */
                return -EINVAL;
        }
-       page = (char*)__get_free_page(GFP_KERNEL);
+       page = (char*)get_zeroed_page(GFP_KERNEL);
        if (!page)
                return -ENOMEM;
-       memset(page, 0, PAGE_SIZE);
        length = -EFAULT;
        if (copy_from_user(page, buf, count))
                goto out;
@@ -186,6 +182,9 @@ static ssize_t sel_write_disable(struct file * file, const char __user * buf,
                length = selinux_disable();
                if (length < 0)
                        goto out;
+               audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS,
+                       "selinux=0 auid=%u",
+                       audit_get_loginuid(current->audit_context));
        }
 
        length = count;
@@ -204,37 +203,11 @@ static struct file_operations sel_disable_ops = {
 static ssize_t sel_read_policyvers(struct file *filp, char __user *buf,
                                    size_t count, loff_t *ppos)
 {
-       char *page;
+       char tmpbuf[TMPBUFLEN];
        ssize_t length;
-       ssize_t end;
 
-       if (count < 0 || count > PAGE_SIZE)
-               return -EINVAL;
-       if (!(page = (char*)__get_free_page(GFP_KERNEL)))
-               return -ENOMEM;
-       memset(page, 0, PAGE_SIZE);
-
-       length = scnprintf(page, PAGE_SIZE, "%u", POLICYDB_VERSION_MAX);
-       if (length < 0) {
-               free_page((unsigned long)page);
-               return length;
-       }
-
-       if (*ppos >= length) {
-               free_page((unsigned long)page);
-               return 0;
-       }
-       if (count + *ppos > length)
-               count = length - *ppos;
-       end = count + *ppos;
-       if (copy_to_user(buf, (char *) page + *ppos, count)) {
-               count = -EFAULT;
-               goto out;
-       }
-       *ppos = end;
-out:
-       free_page((unsigned long)page);
-       return count;
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%u", POLICYDB_VERSION_MAX);
+       return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
 static struct file_operations sel_policyvers_ops = {
@@ -247,37 +220,11 @@ static int sel_make_bools(void);
 static ssize_t sel_read_mls(struct file *filp, char __user *buf,
                                size_t count, loff_t *ppos)
 {
-       char *page;
+       char tmpbuf[TMPBUFLEN];
        ssize_t length;
-       ssize_t end;
-
-       if (count < 0 || count > PAGE_SIZE)
-               return -EINVAL;
-       if (!(page = (char*)__get_free_page(GFP_KERNEL)))
-               return -ENOMEM;
-       memset(page, 0, PAGE_SIZE);
 
-       length = scnprintf(page, PAGE_SIZE, "%d", selinux_mls_enabled);
-       if (length < 0) {
-               free_page((unsigned long)page);
-               return length;
-       }
-
-       if (*ppos >= length) {
-               free_page((unsigned long)page);
-               return 0;
-       }
-       if (count + *ppos > length)
-               count = length - *ppos;
-       end = count + *ppos;
-       if (copy_to_user(buf, (char *) page + *ppos, count)) {
-               count = -EFAULT;
-               goto out;
-       }
-       *ppos = end;
-out:
-       free_page((unsigned long)page);
-       return count;
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%d", selinux_mls_enabled);
+       return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
 static struct file_operations sel_mls_ops = {
@@ -292,7 +239,7 @@ static ssize_t sel_write_load(struct file * file, const char __user * buf,
        ssize_t length;
        void *data = NULL;
 
-       down(&sel_sem);
+       mutex_lock(&sel_mutex);
 
        length = task_has_security(current, SECURITY__LOAD_POLICY);
        if (length)
@@ -304,7 +251,7 @@ static ssize_t sel_write_load(struct file * file, const char __user * buf,
                goto out;
        }
 
-       if ((count < 0) || (count > 64 * 1024 * 1024)
+       if ((count > 64 * 1024 * 1024)
            || (data = vmalloc(count)) == NULL) {
                length = -ENOMEM;
                goto out;
@@ -323,8 +270,11 @@ static ssize_t sel_write_load(struct file * file, const char __user * buf,
                length = ret;
        else
                length = count;
+       audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD,
+               "policy loaded auid=%u",
+               audit_get_loginuid(current->audit_context));
 out:
-       up(&sel_sem);
+       mutex_unlock(&sel_mutex);
        vfree(data);
        return length;
 }
@@ -333,48 +283,87 @@ static struct file_operations sel_load_ops = {
        .write          = sel_write_load,
 };
 
+static ssize_t sel_write_context(struct file * file, char *buf, size_t size)
+{
+       char *canon;
+       u32 sid, len;
+       ssize_t length;
 
-static ssize_t sel_write_context(struct file * file, const char __user * buf,
-                                size_t count, loff_t *ppos)
+       length = task_has_security(current, SECURITY__CHECK_CONTEXT);
+       if (length)
+               return length;
+
+       length = security_context_to_sid(buf, size, &sid);
+       if (length < 0)
+               return length;
 
+       length = security_sid_to_context(sid, &canon, &len);
+       if (length < 0)
+               return length;
+
+       if (len > SIMPLE_TRANSACTION_LIMIT) {
+               printk(KERN_ERR "%s:  context size (%u) exceeds payload "
+                      "max\n", __FUNCTION__, len);
+               length = -ERANGE;
+               goto out;
+       }
+
+       memcpy(buf, canon, len);
+       length = len;
+out:
+       kfree(canon);
+       return length;
+}
+
+static ssize_t sel_read_checkreqprot(struct file *filp, char __user *buf,
+                                    size_t count, loff_t *ppos)
+{
+       char tmpbuf[TMPBUFLEN];
+       ssize_t length;
+
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%u", selinux_checkreqprot);
+       return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
+}
+
+static ssize_t sel_write_checkreqprot(struct file * file, const char __user * buf,
+                                     size_t count, loff_t *ppos)
 {
        char *page;
-       u32 sid;
        ssize_t length;
+       unsigned int new_value;
 
-       length = task_has_security(current, SECURITY__CHECK_CONTEXT);
+       length = task_has_security(current, SECURITY__SETCHECKREQPROT);
        if (length)
                return length;
 
-       if (count < 0 || count >= PAGE_SIZE)
+       if (count >= PAGE_SIZE)
                return -ENOMEM;
        if (*ppos != 0) {
                /* No partial writes. */
                return -EINVAL;
        }
-       page = (char*)__get_free_page(GFP_KERNEL);
+       page = (char*)get_zeroed_page(GFP_KERNEL);
        if (!page)
                return -ENOMEM;
-       memset(page, 0, PAGE_SIZE);
        length = -EFAULT;
        if (copy_from_user(page, buf, count))
                goto out;
 
-       length = security_context_to_sid(page, count, &sid);
-       if (length < 0)
+       length = -EINVAL;
+       if (sscanf(page, "%u", &new_value) != 1)
                goto out;
 
+       selinux_checkreqprot = new_value ? 1 : 0;
        length = count;
 out:
        free_page((unsigned long) page);
        return length;
 }
-
-static struct file_operations sel_context_ops = {
-       .write          = sel_write_context,
+static struct file_operations sel_checkreqprot_ops = {
+       .read           = sel_read_checkreqprot,
+       .write          = sel_write_checkreqprot,
 };
 
-
 /*
  * Remaining nodes use transaction based IO methods like nfsd/nfsctl.c
  */
@@ -382,111 +371,42 @@ 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,
        [SEL_CREATE] = sel_write_create,
        [SEL_RELABEL] = sel_write_relabel,
        [SEL_USER] = sel_write_user,
+       [SEL_MEMBER] = sel_write_member,
+       [SEL_CONTEXT] = sel_write_context,
 };
 
-/* an argresp is stored in an allocated page and holds the
- * size of the argument or response, along with its content
- */
-struct argresp {
-       ssize_t size;
-       char data[0];
-};
-
-#define PAYLOAD_SIZE (PAGE_SIZE - sizeof(struct argresp))
-
-/*
- * transaction based IO methods.
- * The file expects a single write which triggers the transaction, and then
- * possibly a read which collects the result - which is stored in a
- * file-local buffer.
- */
-static ssize_t TA_write(struct file *file, const char __user *buf, size_t size, loff_t *pos)
+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;
-       struct argresp *ar;
-       ssize_t rv = 0;
+       char *data;
+       ssize_t rv;
 
-       if (ino >= sizeof(write_op)/sizeof(write_op[0]) || !write_op[ino])
+       if (ino >= ARRAY_SIZE(write_op) || !write_op[ino])
                return -EINVAL;
-       if (file->private_data)
-               return -EINVAL; /* only one write allowed per open */
-       if (size > PAYLOAD_SIZE - 1) /* allow one byte for null terminator */
-               return -EFBIG;
 
-       ar = kmalloc(PAGE_SIZE, GFP_KERNEL);
-       if (!ar)
-               return -ENOMEM;
-       memset(ar, 0, PAGE_SIZE); /* clear buffer, particularly last byte */
-       ar->size = 0;
-       down(&file->f_dentry->d_inode->i_sem);
-       if (file->private_data)
-               rv = -EINVAL;
-       else
-               file->private_data = ar;
-       up(&file->f_dentry->d_inode->i_sem);
-       if (rv) {
-               kfree(ar);
-               return rv;
-       }
-       if (copy_from_user(ar->data, buf, size))
-               return -EFAULT;
+       data = simple_transaction_get(file, buf, size);
+       if (IS_ERR(data))
+               return PTR_ERR(data);
 
-       rv =  write_op[ino](file, ar->data, size);
+       rv =  write_op[ino](file, data, size);
        if (rv>0) {
-               ar->size = rv;
+               simple_transaction_set(file, rv);
                rv = size;
        }
        return rv;
 }
 
-static ssize_t TA_read(struct file *file, char __user *buf, size_t size, loff_t *pos)
-{
-       struct argresp *ar;
-       ssize_t rv = 0;
-
-       if (file->private_data == NULL)
-               rv = TA_write(file, buf, 0, pos);
-       if (rv < 0)
-               return rv;
-
-       ar = file->private_data;
-       if (!ar)
-               return 0;
-       if (*pos >= ar->size)
-               return 0;
-       if (*pos + size > ar->size)
-               size = ar->size - *pos;
-       if (copy_to_user(buf, ar->data + *pos, size))
-               return -EFAULT;
-       *pos += size;
-       return size;
-}
-
-static int TA_open(struct inode *inode, struct file *file)
-{
-       file->private_data = NULL;
-       return 0;
-}
-
-static int TA_release(struct inode *inode, struct file *file)
-{
-       void *p = file->private_data;
-       file->private_data = NULL;
-       kfree(p);
-       return 0;
-}
-
 static struct file_operations transaction_ops = {
-       .write          = TA_write,
-       .read           = TA_read,
-       .open           = TA_open,
-       .release        = TA_release,
+       .write          = selinux_transaction_write,
+       .read           = simple_transaction_read,
+       .release        = simple_transaction_release,
 };
 
 /*
@@ -509,15 +429,13 @@ static ssize_t sel_write_access(struct file * file, char *buf, size_t size)
                return length;
 
        length = -ENOMEM;
-       scon = kmalloc(size+1, GFP_KERNEL);
+       scon = kzalloc(size+1, GFP_KERNEL);
        if (!scon)
                return length;
-       memset(scon, 0, size+1);
 
-       tcon = kmalloc(size+1, GFP_KERNEL);
+       tcon = kzalloc(size+1, GFP_KERNEL);
        if (!tcon)
                goto out;
-       memset(tcon, 0, size+1);
 
        length = -EINVAL;
        if (sscanf(buf, "%s %s %hu %x", scon, tcon, &tclass, &req) != 4)
@@ -534,7 +452,8 @@ static ssize_t sel_write_access(struct file * file, char *buf, size_t size)
        if (length < 0)
                goto out2;
 
-       length = scnprintf(buf, PAYLOAD_SIZE, "%x %x %x %x %u",
+       length = scnprintf(buf, SIMPLE_TRANSACTION_LIMIT,
+                         "%x %x %x %x %u",
                          avd.allowed, avd.decided,
                          avd.auditallow, avd.auditdeny,
                          avd.seqno);
@@ -559,15 +478,13 @@ static ssize_t sel_write_create(struct file * file, char *buf, size_t size)
                return length;
 
        length = -ENOMEM;
-       scon = kmalloc(size+1, GFP_KERNEL);
+       scon = kzalloc(size+1, GFP_KERNEL);
        if (!scon)
                return length;
-       memset(scon, 0, size+1);
 
-       tcon = kmalloc(size+1, GFP_KERNEL);
+       tcon = kzalloc(size+1, GFP_KERNEL);
        if (!tcon)
                goto out;
-       memset(tcon, 0, size+1);
 
        length = -EINVAL;
        if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
@@ -588,7 +505,7 @@ static ssize_t sel_write_create(struct file * file, char *buf, size_t size)
        if (length < 0)
                goto out2;
 
-       if (len > PAYLOAD_SIZE) {
+       if (len > SIMPLE_TRANSACTION_LIMIT) {
                printk(KERN_ERR "%s:  context size (%u) exceeds payload "
                       "max\n", __FUNCTION__, len);
                length = -ERANGE;
@@ -620,15 +537,13 @@ static ssize_t sel_write_relabel(struct file * file, char *buf, size_t size)
                return length;
 
        length = -ENOMEM;
-       scon = kmalloc(size+1, GFP_KERNEL);
+       scon = kzalloc(size+1, GFP_KERNEL);
        if (!scon)
                return length;
-       memset(scon, 0, size+1);
 
-       tcon = kmalloc(size+1, GFP_KERNEL);
+       tcon = kzalloc(size+1, GFP_KERNEL);
        if (!tcon)
                goto out;
-       memset(tcon, 0, size+1);
 
        length = -EINVAL;
        if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
@@ -649,7 +564,7 @@ static ssize_t sel_write_relabel(struct file * file, char *buf, size_t size)
        if (length < 0)
                goto out2;
 
-       if (len > PAYLOAD_SIZE) {
+       if (len > SIMPLE_TRANSACTION_LIMIT) {
                length = -ERANGE;
                goto out3;
        }
@@ -679,15 +594,13 @@ static ssize_t sel_write_user(struct file * file, char *buf, size_t size)
                return length;
 
        length = -ENOMEM;
-       con = kmalloc(size+1, GFP_KERNEL);
+       con = kzalloc(size+1, GFP_KERNEL);
        if (!con)
                return length;
-       memset(con, 0, size+1);
 
-       user = kmalloc(size+1, GFP_KERNEL);
+       user = kzalloc(size+1, GFP_KERNEL);
        if (!user)
                goto out;
-       memset(user, 0, size+1);
 
        length = -EINVAL;
        if (sscanf(buf, "%s %s", con, user) != 2)
@@ -709,7 +622,7 @@ static ssize_t sel_write_user(struct file * file, char *buf, size_t size)
                        length = rc;
                        goto out3;
                }
-               if ((length + len) >= PAYLOAD_SIZE) {
+               if ((length + len) >= SIMPLE_TRANSACTION_LIMIT) {
                        kfree(newcon);
                        length = -ERANGE;
                        goto out3;
@@ -728,6 +641,65 @@ out:
        return length;
 }
 
+static ssize_t sel_write_member(struct file * file, char *buf, size_t size)
+{
+       char *scon, *tcon;
+       u32 ssid, tsid, newsid;
+       u16 tclass;
+       ssize_t length;
+       char *newcon;
+       u32 len;
+
+       length = task_has_security(current, SECURITY__COMPUTE_MEMBER);
+       if (length)
+               return length;
+
+       length = -ENOMEM;
+       scon = kzalloc(size+1, GFP_KERNEL);
+       if (!scon)
+               return length;
+
+       tcon = kzalloc(size+1, GFP_KERNEL);
+       if (!tcon)
+               goto out;
+
+       length = -EINVAL;
+       if (sscanf(buf, "%s %s %hu", scon, tcon, &tclass) != 3)
+               goto out2;
+
+       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_member_sid(ssid, tsid, tclass, &newsid);
+       if (length < 0)
+               goto out2;
+
+       length = security_sid_to_context(newsid, &newcon, &len);
+       if (length < 0)
+               goto out2;
+
+       if (len > SIMPLE_TRANSACTION_LIMIT) {
+               printk(KERN_ERR "%s:  context size (%u) exceeds payload "
+                      "max\n", __FUNCTION__, len);
+               length = -ERANGE;
+               goto out3;
+       }
+
+       memcpy(buf, newcon, len);
+       length = len;
+out3:
+       kfree(newcon);
+out2:
+       kfree(tcon);
+out:
+       kfree(scon);
+       return length;
+}
+
 static struct inode *sel_make_inode(struct super_block *sb, int mode)
 {
        struct inode *ret = new_inode(sb);
@@ -749,12 +721,11 @@ static ssize_t sel_read_bool(struct file *filep, char __user *buf,
 {
        char *page = NULL;
        ssize_t length;
-       ssize_t end;
        ssize_t ret;
        int cur_enforcing;
        struct inode *inode;
 
-       down(&sel_sem);
+       mutex_lock(&sel_mutex);
 
        ret = -EFAULT;
 
@@ -762,15 +733,14 @@ static ssize_t sel_read_bool(struct file *filep, char __user *buf,
        if (!filep->f_op)
                goto out;
 
-       if (count < 0 || count > PAGE_SIZE) {
+       if (count > PAGE_SIZE) {
                ret = -EINVAL;
                goto out;
        }
-       if (!(page = (char*)__get_free_page(GFP_KERNEL))) {
+       if (!(page = (char*)get_zeroed_page(GFP_KERNEL))) {
                ret = -ENOMEM;
                goto out;
        }
-       memset(page, 0, PAGE_SIZE);
 
        inode = filep->f_dentry->d_inode;
        cur_enforcing = security_get_bool_value(inode->i_ino - BOOL_INO_OFFSET);
@@ -781,26 +751,9 @@ static ssize_t sel_read_bool(struct file *filep, char __user *buf,
 
        length = scnprintf(page, PAGE_SIZE, "%d %d", cur_enforcing,
                          bool_pending_values[inode->i_ino - BOOL_INO_OFFSET]);
-       if (length < 0) {
-               ret = length;
-               goto out;
-       }
-
-       if (*ppos >= length) {
-               ret = 0;
-               goto out;
-       }
-       if (count + *ppos > length)
-               count = length - *ppos;
-       end = count + *ppos;
-       if (copy_to_user(buf, (char *) page + *ppos, count)) {
-               ret = -EFAULT;
-               goto out;
-       }
-       *ppos = end;
-       ret = count;
+       ret = simple_read_from_buffer(buf, count, ppos, page, length);
 out:
-       up(&sel_sem);
+       mutex_unlock(&sel_mutex);
        if (page)
                free_page((unsigned long)page);
        return ret;
@@ -814,7 +767,7 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
        int new_value;
        struct inode *inode;
 
-       down(&sel_sem);
+       mutex_lock(&sel_mutex);
 
        length = task_has_security(current, SECURITY__SETBOOL);
        if (length)
@@ -824,7 +777,7 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
        if (!filep->f_op)
                goto out;
 
-       if (count < 0 || count >= PAGE_SIZE) {
+       if (count >= PAGE_SIZE) {
                length = -ENOMEM;
                goto out;
        }
@@ -832,12 +785,11 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
                /* No partial writes. */
                goto out;
        }
-       page = (char*)__get_free_page(GFP_KERNEL);
+       page = (char*)get_zeroed_page(GFP_KERNEL);
        if (!page) {
                length = -ENOMEM;
                goto out;
        }
-       memset(page, 0, PAGE_SIZE);
 
        if (copy_from_user(page, buf, count))
                goto out;
@@ -854,7 +806,7 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
        length = count;
 
 out:
-       up(&sel_sem);
+       mutex_unlock(&sel_mutex);
        if (page)
                free_page((unsigned long) page);
        return length;
@@ -873,7 +825,7 @@ static ssize_t sel_commit_bools_write(struct file *filep,
        ssize_t length = -EFAULT;
        int new_value;
 
-       down(&sel_sem);
+       mutex_lock(&sel_mutex);
 
        length = task_has_security(current, SECURITY__SETBOOL);
        if (length)
@@ -883,7 +835,7 @@ static ssize_t sel_commit_bools_write(struct file *filep,
        if (!filep->f_op)
                goto out;
 
-       if (count < 0 || count >= PAGE_SIZE) {
+       if (count >= PAGE_SIZE) {
                length = -ENOMEM;
                goto out;
        }
@@ -891,14 +843,12 @@ static ssize_t sel_commit_bools_write(struct file *filep,
                /* No partial writes. */
                goto out;
        }
-       page = (char*)__get_free_page(GFP_KERNEL);
+       page = (char*)get_zeroed_page(GFP_KERNEL);
        if (!page) {
                length = -ENOMEM;
                goto out;
        }
 
-       memset(page, 0, PAGE_SIZE);
-
        if (copy_from_user(page, buf, count))
                goto out;
 
@@ -906,14 +856,14 @@ static ssize_t sel_commit_bools_write(struct file *filep,
        if (sscanf(page, "%d", &new_value) != 1)
                goto out;
 
-       if (new_value) {
+       if (new_value && bool_pending_values) {
                security_set_bools(bool_num, bool_pending_values);
        }
 
        length = count;
 
 out:
-       up(&sel_sem);
+       mutex_unlock(&sel_mutex);
        if (page)
                free_page((unsigned long) page);
        return length;
@@ -933,7 +883,7 @@ static void sel_remove_bools(struct dentry *de)
        spin_lock(&dcache_lock);
        node = de->d_subdirs.next;
        while (node != &de->d_subdirs) {
-               struct dentry *d = list_entry(node, struct dentry, d_child);
+               struct dentry *d = list_entry(node, struct dentry, d_u.d_child);
                list_del_init(node);
 
                if (d->d_inode) {
@@ -951,7 +901,7 @@ static void sel_remove_bools(struct dentry *de)
 
        file_list_lock();
        list_for_each(p, &sb->s_files) {
-               struct file * filp = list_entry(p, struct file, f_list);
+               struct file * filp = list_entry(p, struct file, f_u.fu_list);
                struct dentry * dentry = filp->f_dentry;
 
                if (dentry->d_parent != de) {
@@ -972,31 +922,26 @@ static int sel_make_bools(void)
        struct dentry *dir = bool_dir;
        struct inode *inode = NULL;
        struct inode_security_struct *isec;
-       struct qstr qname;
        char **names = NULL, *page;
        int num;
        int *values = NULL;
        u32 sid;
 
        /* remove any existing files */
-       if (bool_pending_values)
-               kfree(bool_pending_values);
+       kfree(bool_pending_values);
+       bool_pending_values = NULL;
 
        sel_remove_bools(dir);
 
-       if (!(page = (char*)__get_free_page(GFP_KERNEL)))
+       if (!(page = (char*)get_zeroed_page(GFP_KERNEL)))
                return -ENOMEM;
-       memset(page, 0, PAGE_SIZE);
 
        ret = security_get_bools(&num, &names, &values);
        if (ret != 0)
                goto out;
 
        for (i = 0; i < num; i++) {
-               qname.name = names[i];
-               qname.len = strlen(qname.name);
-               qname.hash = full_name_hash(qname.name, qname.len);
-               dentry = d_alloc(dir, &qname);
+               dentry = d_alloc_name(dir, names[i]);
                if (!dentry) {
                        ret = -ENOMEM;
                        goto err;
@@ -1029,30 +974,241 @@ static int sel_make_bools(void)
 out:
        free_page((unsigned long)page);
        if (names) {
-               for (i = 0; i < num; i++) {
-                       if (names[i])
-                               kfree(names[i]);
-               }
+               for (i = 0; i < num; i++)
+                       kfree(names[i]);
                kfree(names);
        }
        return ret;
 err:
-       d_genocide(dir);
+       kfree(values);
+       sel_remove_bools(dir);
        ret = -ENOMEM;
        goto out;
 }
 
+#define NULL_FILE_NAME "null"
+
+struct dentry *selinux_null = NULL;
+
+static ssize_t sel_read_avc_cache_threshold(struct file *filp, char __user *buf,
+                                           size_t count, loff_t *ppos)
+{
+       char tmpbuf[TMPBUFLEN];
+       ssize_t length;
+
+       length = scnprintf(tmpbuf, TMPBUFLEN, "%u", avc_cache_threshold);
+       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,
+                                            size_t count, loff_t *ppos)
+
+{
+       char *page;
+       ssize_t ret;
+       int new_value;
+
+       if (count >= PAGE_SIZE) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       if (*ppos != 0) {
+               /* No partial writes. */
+               ret = -EINVAL;
+               goto out;
+       }
+
+       page = (char*)get_zeroed_page(GFP_KERNEL);
+       if (!page) {
+               ret = -ENOMEM;
+               goto out;
+       }
+
+       if (copy_from_user(page, buf, count)) {
+               ret = -EFAULT;
+               goto out_free;
+       }
+
+       if (sscanf(page, "%u", &new_value) != 1) {
+               ret = -EINVAL;
+               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 = count;
+out_free:
+       free_page((unsigned long)page);
+out:
+       return ret;
+}
+
+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;
+
+       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);
+       free_page((unsigned long)page);
+out:
+       return ret;
+}
+
+static struct file_operations sel_avc_cache_threshold_ops = {
+       .read           = sel_read_avc_cache_threshold,
+       .write          = sel_write_avc_cache_threshold,
+};
+
+static struct file_operations sel_avc_hash_stats_ops = {
+       .read           = sel_read_avc_hash_stats,
+};
+
+#ifdef CONFIG_SECURITY_SELINUX_AVC_STATS
+static struct avc_cache_stats *sel_avc_get_stat_idx(loff_t *idx)
+{
+       int cpu;
+
+       for (cpu = *idx; cpu < NR_CPUS; ++cpu) {
+               if (!cpu_possible(cpu))
+                       continue;
+               *idx = cpu + 1;
+               return &per_cpu(avc_cache_stats, cpu);
+       }
+       return NULL;
+}
+
+static void *sel_avc_stats_seq_start(struct seq_file *seq, loff_t *pos)
+{
+       loff_t n = *pos - 1;
+
+       if (*pos == 0)
+               return SEQ_START_TOKEN;
+
+       return sel_avc_get_stat_idx(&n);
+}
+
+static void *sel_avc_stats_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+       return sel_avc_get_stat_idx(pos);
+}
+
+static int sel_avc_stats_seq_show(struct seq_file *seq, void *v)
+{
+       struct avc_cache_stats *st = 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,
+                          st->reclaims, st->frees);
+       return 0;
+}
+
+static void sel_avc_stats_seq_stop(struct seq_file *seq, void *v)
+{ }
+
+static 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,
+       .stop           = sel_avc_stats_seq_stop,
+};
+
+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 = {
+       .open           = sel_open_avc_cache_stats,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = seq_release,
+};
+#endif
+
+static int sel_make_avc_files(struct dentry *dir)
+{
+       int i, ret = 0;
+       static struct tree_descr files[] = {
+               { "cache_threshold",
+                 &sel_avc_cache_threshold_ops, S_IRUGO|S_IWUSR },
+               { "hash_stats", &sel_avc_hash_stats_ops, S_IRUGO },
+#ifdef CONFIG_SECURITY_SELINUX_AVC_STATS
+               { "cache_stats", &sel_avc_cache_stats_ops, S_IRUGO },
+#endif
+       };
+
+       for (i = 0; i < ARRAY_SIZE(files); i++) {
+               struct inode *inode;
+               struct dentry *dentry;
+
+               dentry = d_alloc_name(dir, files[i].name);
+               if (!dentry) {
+                       ret = -ENOMEM;
+                       goto out;
+               }
+
+               inode = sel_make_inode(dir->d_sb, S_IFREG|files[i].mode);
+               if (!inode) {
+                       ret = -ENOMEM;
+                       goto out;
+               }
+               inode->i_fop = files[i].ops;
+               d_add(dentry, inode);
+       }
+out:
+       return ret;
+}
+
+static int sel_make_dir(struct inode *dir, struct dentry *dentry)
+{
+       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;
+       }
+       inode->i_op = &simple_dir_inode_operations;
+       inode->i_fop = &simple_dir_operations;
+       /* directory inodes start off with i_nlink == 2 (for "." entry) */
+       inode->i_nlink++;
+       d_add(dentry, inode);
+       /* bump link count on parent directory, too */
+       dir->i_nlink++;
+out:
+       return ret;
+}
+
 static int sel_fill_super(struct super_block * sb, void * data, int silent)
 {
        int ret;
        struct dentry *dentry;
-       struct inode *inode;
-       struct qstr qname;
+       struct inode *inode, *root_inode;
+       struct inode_security_struct *isec;
 
        static struct tree_descr selinux_files[] = {
                [SEL_LOAD] = {"load", &sel_load_ops, S_IRUSR|S_IWUSR},
                [SEL_ENFORCE] = {"enforce", &sel_enforce_ops, S_IRUGO|S_IWUSR},
-               [SEL_CONTEXT] = {"context", &sel_context_ops, S_IRUGO|S_IWUGO},
+               [SEL_CONTEXT] = {"context", &transaction_ops, S_IRUGO|S_IWUGO},
                [SEL_ACCESS] = {"access", &transaction_ops, S_IRUGO|S_IWUGO},
                [SEL_CREATE] = {"create", &transaction_ops, S_IRUGO|S_IWUGO},
                [SEL_RELABEL] = {"relabel", &transaction_ops, S_IRUGO|S_IWUGO},
@@ -1061,35 +1217,66 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
                [SEL_COMMIT_BOOLS] = {"commit_pending_bools", &sel_commit_bools_ops, S_IWUSR},
                [SEL_MLS] = {"mls", &sel_mls_ops, S_IRUGO},
                [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},
                /* last one */ {""}
        };
        ret = simple_fill_super(sb, SELINUX_MAGIC, selinux_files);
        if (ret)
-               return ret;
+               goto err;
 
-       qname.name = BOOL_DIR_NAME;
-       qname.len = strlen(qname.name);
-       qname.hash = full_name_hash(qname.name, qname.len);
-       dentry = d_alloc(sb->s_root, &qname);
-       if (!dentry)
-               return -ENOMEM;
+       root_inode = sb->s_root->d_inode;
+
+       dentry = d_alloc_name(sb->s_root, BOOL_DIR_NAME);
+       if (!dentry) {
+               ret = -ENOMEM;
+               goto err;
+       }
+
+       ret = sel_make_dir(root_inode, dentry);
+       if (ret)
+               goto err;
 
-       inode = sel_make_inode(sb, S_IFDIR | S_IRUGO | S_IXUGO);
-       if (!inode)
-               goto out;
-       inode->i_op = &simple_dir_inode_operations;
-       inode->i_fop = &simple_dir_operations;
-       d_add(dentry, inode);
        bool_dir = dentry;
-       ret = sel_make_bools();
+
+       dentry = d_alloc_name(sb->s_root, NULL_FILE_NAME);
+       if (!dentry) {
+               ret = -ENOMEM;
+               goto err;
+       }
+
+       inode = sel_make_inode(sb, S_IFCHR | S_IRUGO | S_IWUGO);
+       if (!inode) {
+               ret = -ENOMEM;
+               goto err;
+       }
+       isec = (struct inode_security_struct*)inode->i_security;
+       isec->sid = SECINITSID_DEVNULL;
+       isec->sclass = SECCLASS_CHR_FILE;
+       isec->initialized = 1;
+
+       init_special_inode(inode, S_IFCHR | S_IRUGO | S_IWUGO, MKDEV(MEM_MAJOR, 3));
+       d_add(dentry, inode);
+       selinux_null = dentry;
+
+       dentry = d_alloc_name(sb->s_root, "avc");
+       if (!dentry) {
+               ret = -ENOMEM;
+               goto err;
+       }
+
+       ret = sel_make_dir(root_inode, dentry);
        if (ret)
-               goto out;
+               goto err;
 
-       return 0;
+       ret = sel_make_avc_files(dentry);
+       if (ret)
+               goto err;
 out:
-       dput(dentry);
-       printk(KERN_ERR "security:      error creating conditional out_dput\n");
-       return -ENOMEM;
+       return ret;
+err:
+       printk(KERN_ERR "%s:  failed while creating inodes\n", __FUNCTION__);
+       goto out;
 }
 
 static struct super_block *sel_get_sb(struct file_system_type *fs_type,
@@ -1104,9 +1291,24 @@ static struct file_system_type sel_fs_type = {
        .kill_sb        = kill_litter_super,
 };
 
+struct vfsmount *selinuxfs_mount;
+
 static int __init init_sel_fs(void)
 {
-       return selinux_enabled ? register_filesystem(&sel_fs_type) : 0;
+       int err;
+
+       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;
+               }
+       }
+       return err;
 }
 
 __initcall(init_sel_fs);