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

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

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index 1948904..3545934 100644 (file)
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -282,7 +282,7 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf,
 
        length = -ENOMEM;
        if (count >= PAGE_SIZE)
 
        length = -ENOMEM;
        if (count >= PAGE_SIZE)

-               goto out;;
+               goto out;

 
        /* No partial writes. */
        length = -EINVAL;
 
        /* No partial writes. */
        length = -EINVAL;


@@ -924,12 +924,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)
 
        length = task_has_security(current, SECURITY__COMPUTE_USER);
        if (length)

-               goto out;;
+               goto out;

 
        length = -ENOMEM;
        con = kzalloc(size + 1, GFP_KERNEL);
        if (!con)
 
        length = -ENOMEM;
        con = kzalloc(size + 1, GFP_KERNEL);
        if (!con)

-               goto out;;
+               goto out;

 
        length = -ENOMEM;
        user = kzalloc(size + 1, GFP_KERNEL);
 
        length = -ENOMEM;
        user = kzalloc(size + 1, GFP_KERNEL);


@@ -989,7 +989,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)
        length = -ENOMEM;
        scon = kzalloc(size + 1, GFP_KERNEL);
        if (!scon)

-               goto out;;
+               goto out;

 
        length = -ENOMEM;
        tcon = kzalloc(size + 1, GFP_KERNEL);
 
        length = -ENOMEM;
        tcon = kzalloc(size + 1, GFP_KERNEL);


@@ -1428,10 +1428,14 @@ static int sel_avc_stats_seq_show(struct seq_file *seq, void *v)
        if (v == SEQ_START_TOKEN)
                seq_printf(seq, "lookups hits misses allocations reclaims "
                           "frees\n");
        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);
                           st->reclaims, st->frees);

+       }

        return 0;
 }
 
        return 0;
 }