Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus

[pandora-kernel.git] / security / selinux / selinuxfs.c

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index fde4e9d..77d4413 100644 (file)
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -281,7 +281,7 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf,
 
        length = -ENOMEM;
        if (count >= PAGE_SIZE)
-               goto out;;
+               goto out;
 
        /* No partial writes. */
        length = -EINVAL;
@@ -889,12 +889,12 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size)
 
        length = task_has_security(current, SECURITY__COMPUTE_USER);
        if (length)
-               goto out;;
+               goto out;
 
        length = -ENOMEM;
        con = kzalloc(size + 1, GFP_KERNEL);
        if (!con)
-               goto out;;
+               goto out;
 
        length = -ENOMEM;
        user = kzalloc(size + 1, GFP_KERNEL);
@@ -954,7 +954,7 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size)
        length = -ENOMEM;
        scon = kzalloc(size + 1, GFP_KERNEL);
        if (!scon)
-               goto out;;
+               goto out;
 
        length = -ENOMEM;
        tcon = kzalloc(size + 1, GFP_KERNEL);
@@ -1393,10 +1393,14 @@ static int sel_avc_stats_seq_show(struct seq_file *seq, void *v)
        if (v == SEQ_START_TOKEN)
                seq_printf(seq, "lookups hits misses allocations reclaims "
                           "frees\n");
-       else
-               seq_printf(seq, "%u %u %u %u %u %u\n", st->lookups,
-                          st->hits, st->misses, st->allocations,
+       else {
+               unsigned int lookups = st->lookups;
+               unsigned int misses = st->misses;
+               unsigned int hits = lookups - misses;
+               seq_printf(seq, "%u %u %u %u %u %u\n", lookups,
+                          hits, misses, st->allocations,
                           st->reclaims, st->frees);
+       }
        return 0;
 }