[PATCH] SELinux: convert to kzalloc

This patch converts SELinux code from kmalloc/memset to the new kazalloc
unction.  On i386, this results in a text saving of over 1K.

Before:
text    data     bss     dec     hex filename
86319    4642   15236  106197   19ed5 security/selinux/built-in.o

After:
text    data     bss     dec     hex filename
85278    4642   15236  105156   19ac4 security/selinux/built-in.o

Signed-off-by: James Morris <jmorris@namei.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 20 deletions

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index a45cc971e735..5f8427627211 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -424,15 +424,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)
@@ -475,15 +473,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)
@@ -536,15 +532,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)
@@ -595,15 +589,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)
@@ -658,15 +650,13 @@ static ssize_t sel_write_member(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)