SELinux: unify printk messages

Replace "security:" prefixes in printk messages with "SELinux"
to help users identify the source of the messages.  Also fix a
couple of minor formatting issues.

Signed-off-by: James Morris <jmorris@namei.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c
index 920b5e36a1af..e499af474b35 100644
--- a/security/selinux/ss/ebitmap.c
+++ b/security/selinux/ss/ebitmap.c
@@ -364,7 +364,7 @@ int ebitmap_read(struct ebitmap *e, void *fp)
         count = le32_to_cpu(buf[2]);
 
         if (mapunit != sizeof(u64) * 8) {
-                printk(KERN_ERR "security: ebitmap: map size %u does not "
+                printk(KERN_ERR "SELinux: ebitmap: map size %u does not "
                        "match my size %Zd (high bit was %d)\n",
                        mapunit, sizeof(u64) * 8, e->highbit);
                 goto bad;
@@ -382,19 +382,19 @@ int ebitmap_read(struct ebitmap *e, void *fp)
         for (i = 0; i < count; i++) {
                 rc = next_entry(&startbit, fp, sizeof(u32));
                 if (rc < 0) {
-                        printk(KERN_ERR "security: ebitmap: truncated map\n");
+                        printk(KERN_ERR "SELinux: ebitmap: truncated map\n");
                         goto bad;
                 }
                 startbit = le32_to_cpu(startbit);
 
                 if (startbit & (mapunit - 1)) {
-                        printk(KERN_ERR "security: ebitmap start bit (%d) is "
+                        printk(KERN_ERR "SELinux: ebitmap start bit (%d) is "
                                "not a multiple of the map unit size (%u)\n",
                                startbit, mapunit);
                         goto bad;
                 }
                 if (startbit > e->highbit - mapunit) {
-                        printk(KERN_ERR "security: ebitmap start bit (%d) is "
+                        printk(KERN_ERR "SELinux: ebitmap start bit (%d) is "
                                "beyond the end of the bitmap (%u)\n",
                                startbit, (e->highbit - mapunit));
                         goto bad;
@@ -405,7 +405,7 @@ int ebitmap_read(struct ebitmap *e, void *fp)
                         tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
                         if (!tmp) {
                                 printk(KERN_ERR
-                                       "security: ebitmap: out of memory\n");
+                                       "SELinux: ebitmap: out of memory\n");
                                 rc = -ENOMEM;
                                 goto bad;
                         }
@@ -418,7 +418,7 @@ int ebitmap_read(struct ebitmap *e, void *fp)
                         }
                         n = tmp;
                 } else if (startbit <= n->startbit) {
-                        printk(KERN_ERR "security: ebitmap: start bit %d"
+                        printk(KERN_ERR "SELinux: ebitmap: start bit %d"
                                " comes after start bit %d\n",
                                startbit, n->startbit);
                         goto bad;
@@ -426,7 +426,7 @@ int ebitmap_read(struct ebitmap *e, void *fp)
 
                 rc = next_entry(&map, fp, sizeof(u64));
                 if (rc < 0) {
-                        printk(KERN_ERR "security: ebitmap: truncated map\n");
+                        printk(KERN_ERR "SELinux: ebitmap: truncated map\n");
                         goto bad;
                 }
                 map = le64_to_cpu(map);