[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, 4 insertions, 7 deletions

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index aecdded55e74..44eb4d74908d 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1531,12 +1531,11 @@ int security_get_user_sids(u32 fromsid,
         }
         usercon.user = user->value;
 
-        mysids = kmalloc(maxnel*sizeof(*mysids), GFP_ATOMIC);
+        mysids = kcalloc(maxnel, sizeof(*mysids), GFP_ATOMIC);
         if (!mysids) {
                 rc = -ENOMEM;
                 goto out_unlock;
         }
-        memset(mysids, 0, maxnel*sizeof(*mysids));
 
         ebitmap_for_each_bit(&user->roles, rnode, i) {
                 if (!ebitmap_node_get_bit(rnode, i))
@@ -1566,13 +1565,12 @@ int security_get_user_sids(u32 fromsid,
                                 mysids[mynel++] = sid;
                         } else {
                                 maxnel += SIDS_NEL;
-                                mysids2 = kmalloc(maxnel*sizeof(*mysids2), GFP_ATOMIC);
+                                mysids2 = kcalloc(maxnel, sizeof(*mysids2), GFP_ATOMIC);
                                 if (!mysids2) {
                                         rc = -ENOMEM;
                                         kfree(mysids);
                                         goto out_unlock;
                                 }
-                                memset(mysids2, 0, maxnel*sizeof(*mysids2));
                                 memcpy(mysids2, mysids, mynel * sizeof(*mysids2));
                                 kfree(mysids);
                                 mysids = mysids2;
@@ -1714,12 +1712,11 @@ int security_get_bools(int *len, char ***names, int **values)
                 goto out;
         }
 
-        *names = (char**)kmalloc(sizeof(char*) * *len, GFP_ATOMIC);
+        *names = (char**)kcalloc(*len, sizeof(char*), GFP_ATOMIC);
         if (!*names)
                 goto err;
-        memset(*names, 0, sizeof(char*) * *len);
 
-        *values = (int*)kmalloc(sizeof(int) * *len, GFP_ATOMIC);
+        *values = (int*)kcalloc(*len, sizeof(int), GFP_ATOMIC);
         if (!*values)
                 goto err;