Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
  SELinux: one little, two little, three little whitespaces, the avc.c saga.
  SELinux: cleanup on isle selinuxfs.c
  changing whitespace for fun and profit: policydb.c
  SELinux: whitespace and formating fixes for hooks.c
  SELinux: clean up printks
  SELinux: sidtab.c whitespace, syntax, and static declaraction cleanups
  SELinux: services.c whitespace, syntax, and static declaraction cleanups
  SELinux: mls.c whitespace, syntax, and static declaraction cleanups
  SELinux: hashtab.c whitespace, syntax, and static declaraction cleanups
  SELinux: ebitmap.c whitespace, syntax, and static declaraction cleanups
  SELinux: conditional.c whitespace, syntax, and static declaraction cleanups
  SELinux: avtab.c whitespace, syntax, and static declaraction cleanups
  SELinux: xfrm.c whitespace, syntax, and static declaraction cleanups
  SELinux: nlmsgtab.c whitespace, syntax, and static declaraction cleanups
  SELinux: netnode.c whitespace, syntax, and static declaraction cleanups
  SELinux: netlink.c whitespace, syntax, and static declaraction cleanups
  SELinux: netlabel.c whitespace, syntax, and static declaraction cleanups
  SELinux: netif.c whitespace, syntax, and static declaraction cleanups

1 files changed, 65 insertions, 62 deletions

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 7b681692be47..ac1ccc13a704 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -1,16 +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
+ *      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.
  */
 
@@ -57,14 +57,14 @@ int selinux_compat_net = SELINUX_COMPAT_NET_VALUE;
 
 static int __init checkreqprot_setup(char *str)
 {
-        selinux_checkreqprot = simple_strtoul(str,NULL,0) ? 1 : 0;
+        selinux_checkreqprot = simple_strtoul(str, NULL, 0) ? 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;
+        selinux_compat_net = simple_strtoul(str, NULL, 0) ? 1 : 0;
         return 1;
 }
 __setup("selinux_compat_net=", selinux_compat_net_setup);
@@ -73,17 +73,17 @@ __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 struct dentry *bool_dir;
+static int bool_num;
 static char **bool_pending_names;
-static int *bool_pending_values = NULL;
+static int *bool_pending_values;
 
 /* global data for classes */
-static struct dentry *class_dir = NULL;
+static struct dentry *class_dir;
 static unsigned long last_class_ino;
 
 /* global data for policy capabilities */
-static struct dentry *policycap_dir = NULL;
+static struct dentry *policycap_dir;
 
 extern void selnl_notify_setenforce(int val);
 
@@ -142,7 +142,7 @@ 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)
 
 {
@@ -156,7 +156,7 @@ static ssize_t sel_write_enforce(struct file * file, const char __user * buf,
                 /* No partial writes. */
                 return -EINVAL;
         }
-        page = (char*)get_zeroed_page(GFP_KERNEL);
+        page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page)
                 return -ENOMEM;
         length = -EFAULT;
@@ -213,7 +213,7 @@ static const struct file_operations sel_handle_unknown_ops = {
 };
 
 #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)
 
 {
@@ -228,7 +228,7 @@ static ssize_t sel_write_disable(struct file * file, const char __user * buf,
                 /* No partial writes. */
                 return -EINVAL;
         }
-        page = (char*)get_zeroed_page(GFP_KERNEL);
+        page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page)
                 return -ENOMEM;
         length = -EFAULT;
@@ -263,7 +263,7 @@ static const struct file_operations sel_disable_ops = {
 };
 
 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;
@@ -299,7 +299,7 @@ static const struct file_operations sel_mls_ops = {
         .read           = sel_read_mls,
 };
 
-static ssize_t sel_write_load(struct file * file, const char __user * buf,
+static ssize_t sel_write_load(struct file *file, const char __user *buf,
                               size_t count, loff_t *ppos)
 
 {
@@ -371,7 +371,7 @@ static const struct file_operations sel_load_ops = {
         .write          = sel_write_load,
 };
 
-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;
         u32 sid, len;
@@ -390,8 +390,8 @@ static ssize_t sel_write_context(struct file * file, char *buf, size_t size)
                 return length;
 
         if (len > SIMPLE_TRANSACTION_LIMIT) {
-                printk(KERN_ERR "%s:  context size (%u) exceeds payload "
-                       "max\n", __func__, len);
+                printk(KERN_ERR "SELinux: %s:  context size (%u) exceeds "
+                        "payload max\n", __func__, len);
                 length = -ERANGE;
                 goto out;
         }
@@ -413,7 +413,7 @@ 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;
@@ -430,7 +430,7 @@ static ssize_t sel_write_checkreqprot(struct file * file, const char __user * bu
                 /* No partial writes. */
                 return -EINVAL;
         }
-        page = (char*)get_zeroed_page(GFP_KERNEL);
+        page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page)
                 return -ENOMEM;
         length = -EFAULT;
@@ -462,7 +462,7 @@ static ssize_t sel_read_compat_net(struct file *filp, char __user *buf,
         return simple_read_from_buffer(buf, count, ppos, tmpbuf, length);
 }
 
-static ssize_t sel_write_compat_net(struct file * file, const char __user * buf,
+static ssize_t sel_write_compat_net(struct file *file, const char __user *buf,
                                     size_t count, loff_t *ppos)
 {
         char *page;
@@ -479,7 +479,7 @@ static ssize_t sel_write_compat_net(struct file * file, const char __user * buf,
                 /* No partial writes. */
                 return -EINVAL;
         }
-        page = (char*)get_zeroed_page(GFP_KERNEL);
+        page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page)
                 return -ENOMEM;
         length = -EFAULT;
@@ -504,11 +504,11 @@ static const struct file_operations sel_compat_net_ops = {
 /*
  * 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,
@@ -521,7 +521,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_path.dentry->d_inode->i_ino;
+        ino_t ino = file->f_path.dentry->d_inode->i_ino;
         char *data;
         ssize_t rv;
 
@@ -532,8 +532,8 @@ 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;
         }
@@ -552,7 +552,7 @@ static const 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;
         u32 ssid, tsid;
@@ -601,7 +601,7 @@ out:
         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;
         u32 ssid, tsid, newsid;
@@ -643,8 +643,8 @@ static ssize_t sel_write_create(struct file * file, char *buf, size_t size)
                 goto out2;
 
         if (len > SIMPLE_TRANSACTION_LIMIT) {
-                printk(KERN_ERR "%s:  context size (%u) exceeds payload "
-                       "max\n", __func__, len);
+                printk(KERN_ERR "SELinux: %s:  context size (%u) exceeds "
+                        "payload max\n", __func__, len);
                 length = -ERANGE;
                 goto out3;
         }
@@ -660,7 +660,7 @@ out:
         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;
         u32 ssid, tsid, newsid;
@@ -717,7 +717,7 @@ out:
         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;
@@ -778,7 +778,7 @@ out:
         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;
         u32 ssid, tsid, newsid;
@@ -820,8 +820,8 @@ static ssize_t sel_write_member(struct file * file, char *buf, size_t size)
                 goto out2;
 
         if (len > SIMPLE_TRANSACTION_LIMIT) {
-                printk(KERN_ERR "%s:  context size (%u) exceeds payload "
-                       "max\n", __func__, len);
+                printk(KERN_ERR "SELinux: %s:  context size (%u) exceeds "
+                        "payload max\n", __func__, len);
                 length = -ERANGE;
                 goto out3;
         }
@@ -872,7 +872,8 @@ static ssize_t sel_read_bool(struct file *filep, char __user *buf,
                 ret = -EINVAL;
                 goto out;
         }
-        if (!(page = (char*)get_zeroed_page(GFP_KERNEL))) {
+        page = (char *)get_zeroed_page(GFP_KERNEL);
+        if (!page) {
                 ret = -ENOMEM;
                 goto out;
         }
@@ -923,7 +924,7 @@ static ssize_t sel_write_bool(struct file *filep, const char __user *buf,
                 length = -EINVAL;
                 goto out;
         }
-        page = (char*)get_zeroed_page(GFP_KERNEL);
+        page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page) {
                 length = -ENOMEM;
                 goto out;
@@ -951,8 +952,8 @@ out:
 }
 
 static const struct file_operations sel_bool_ops = {
-        .read           = sel_read_bool,
-        .write          = sel_write_bool,
+        .read           = sel_read_bool,
+        .write          = sel_write_bool,
 };
 
 static ssize_t sel_commit_bools_write(struct file *filep,
@@ -977,7 +978,7 @@ static ssize_t sel_commit_bools_write(struct file *filep,
                 /* No partial writes. */
                 goto out;
         }
-        page = (char*)get_zeroed_page(GFP_KERNEL);
+        page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page) {
                 length = -ENOMEM;
                 goto out;
@@ -991,9 +992,8 @@ 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) {
+        if (new_value && bool_pending_values)
                 security_set_bools(bool_num, bool_pending_values);
-        }
 
         length = count;
 
@@ -1005,7 +1005,7 @@ out:
 }
 
 static const struct file_operations sel_commit_bools_ops = {
-        .write          = sel_commit_bools_write,
+        .write          = sel_commit_bools_write,
 };
 
 static void sel_remove_entries(struct dentry *de)
@@ -1055,7 +1055,8 @@ static int sel_make_bools(void)
 
         sel_remove_entries(dir);
 
-        if (!(page = (char*)get_zeroed_page(GFP_KERNEL)))
+        page = (char *)get_zeroed_page(GFP_KERNEL);
+        if (!page)
                 return -ENOMEM;
 
         ret = security_get_bools(&num, &names, &values);
@@ -1082,8 +1083,9 @@ static int sel_make_bools(void)
                         ret = -ENAMETOOLONG;
                         goto err;
                 }
-                isec = (struct inode_security_struct*)inode->i_security;
-                if ((ret = security_genfs_sid("selinuxfs", page, SECCLASS_FILE, &sid)))
+                isec = (struct inode_security_struct *)inode->i_security;
+                ret = security_genfs_sid("selinuxfs", page, SECCLASS_FILE, &sid);
+                if (ret)
                         goto err;
                 isec->sid = sid;
                 isec->initialized = 1;
@@ -1111,7 +1113,7 @@ err:
 
 #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)
@@ -1123,8 +1125,8 @@ 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)
 
 {
@@ -1143,7 +1145,7 @@ static ssize_t sel_write_avc_cache_threshold(struct file * file,
                 goto out;
         }
 
-        page = (char*)get_zeroed_page(GFP_KERNEL);
+        page = (char *)get_zeroed_page(GFP_KERNEL);
         if (!page) {
                 ret = -ENOMEM;
                 goto out;
@@ -1301,7 +1303,7 @@ out:
         return ret;
 }
 
-static ssize_t sel_read_initcon(struct file * file, char __user *buf,
+static ssize_t sel_read_initcon(struct file *file, char __user *buf,
                                 size_t count, loff_t *ppos)
 {
         struct inode *inode;
@@ -1375,7 +1377,7 @@ 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,
+static ssize_t sel_read_class(struct file *file, char __user *buf,
                                 size_t count, loff_t *ppos)
 {
         ssize_t rc, len;
@@ -1399,7 +1401,7 @@ static const struct file_operations sel_class_ops = {
         .read           = sel_read_class,
 };
 
-static ssize_t sel_read_perm(struct file * file, char __user *buf,
+static ssize_t sel_read_perm(struct file *file, char __user *buf,
                                 size_t count, loff_t *ppos)
 {
         ssize_t rc, len;
@@ -1412,7 +1414,7 @@ static ssize_t sel_read_perm(struct file * file, char __user *buf,
                 goto out;
         }
 
-        len = snprintf(page, PAGE_SIZE,"%d", sel_ino_to_perm(ino));
+        len = snprintf(page, PAGE_SIZE, "%d", sel_ino_to_perm(ino));
         rc = simple_read_from_buffer(buf, count, ppos, page, len);
         free_page((unsigned long)page);
 out:
@@ -1640,7 +1642,7 @@ out:
         return ret;
 }
 
-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;
@@ -1696,7 +1698,7 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
                 goto err;
         }
         inode->i_ino = ++sel_last_ino;
-        isec = (struct inode_security_struct*)inode->i_security;
+        isec = (struct inode_security_struct *)inode->i_security;
         isec->sid = SECINITSID_DEVNULL;
         isec->sclass = SECCLASS_CHR_FILE;
         isec->initialized = 1;
@@ -1760,7 +1762,8 @@ static int sel_fill_super(struct super_block * sb, void * data, int silent)
 out:
         return ret;
 err:
-        printk(KERN_ERR "%s:  failed while creating inodes\n", __func__);
+        printk(KERN_ERR "SELinux: %s:  failed while creating inodes\n",
+                __func__);
         goto out;
 }