[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>

5 files changed, 30 insertions, 59 deletions

diff --git a/security/selinux/ss/conditional.c b/security/selinux/ss/conditional.c
index daf288007460..d2737edba541 100644
--- a/security/selinux/ss/conditional.c
+++ b/security/selinux/ss/conditional.c
@@ -220,10 +220,9 @@ int cond_read_bool(struct policydb *p, struct hashtab *h, void *fp)
         u32 len;
         int rc;
 
-        booldatum = kmalloc(sizeof(struct cond_bool_datum), GFP_KERNEL);
+        booldatum = kzalloc(sizeof(struct cond_bool_datum), GFP_KERNEL);
         if (!booldatum)
                 return -1;
-        memset(booldatum, 0, sizeof(struct cond_bool_datum));
 
         rc = next_entry(buf, fp, sizeof buf);
         if (rc < 0)
@@ -321,10 +320,9 @@ static int cond_insertf(struct avtab *a, struct avtab_key *k, struct avtab_datum
                 goto err;
         }
 
-        list = kmalloc(sizeof(struct cond_av_list), GFP_KERNEL);
+        list = kzalloc(sizeof(struct cond_av_list), GFP_KERNEL);
         if (!list)
                 goto err;
-        memset(list, 0, sizeof(*list));
 
         list->node = node_ptr;
         if (!data->head)
@@ -414,11 +412,10 @@ static int cond_read_node(struct policydb *p, struct cond_node *node, void *fp)
                 if (rc < 0)
                         goto err;
 
-                expr = kmalloc(sizeof(struct cond_expr), GFP_KERNEL);
+                expr = kzalloc(sizeof(struct cond_expr), GFP_KERNEL);
                 if (!expr) {
                         goto err;
                 }
-                memset(expr, 0, sizeof(struct cond_expr));
 
                 expr->expr_type = le32_to_cpu(buf[0]);
                 expr->bool = le32_to_cpu(buf[1]);
@@ -460,10 +457,9 @@ int cond_read_list(struct policydb *p, void *fp)
         len = le32_to_cpu(buf[0]);
 
         for (i = 0; i < len; i++) {
-                node = kmalloc(sizeof(struct cond_node), GFP_KERNEL);
+                node = kzalloc(sizeof(struct cond_node), GFP_KERNEL);
                 if (!node)
                         goto err;
-                memset(node, 0, sizeof(struct cond_node));
 
                 if (cond_read_node(p, node, fp) != 0)
                         goto err;
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c
index d515154128cc..47024a6e1844 100644
--- a/security/selinux/ss/ebitmap.c
+++ b/security/selinux/ss/ebitmap.c
@@ -39,12 +39,11 @@ int ebitmap_cpy(struct ebitmap *dst, struct ebitmap *src)
         n = src->node;
         prev = NULL;
         while (n) {
-                new = kmalloc(sizeof(*new), GFP_ATOMIC);
+                new = kzalloc(sizeof(*new), GFP_ATOMIC);
                 if (!new) {
                         ebitmap_destroy(dst);
                         return -ENOMEM;
                 }
-                memset(new, 0, sizeof(*new));
                 new->startbit = n->startbit;
                 new->map = n->map;
                 new->next = NULL;
@@ -150,10 +149,9 @@ int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value)
         if (!value)
                 return 0;
 
-        new = kmalloc(sizeof(*new), GFP_ATOMIC);
+        new = kzalloc(sizeof(*new), GFP_ATOMIC);
         if (!new)
                 return -ENOMEM;
-        memset(new, 0, sizeof(*new));
 
         new->startbit = bit & ~(MAPSIZE - 1);
         new->map = (MAPBIT << (bit - new->startbit));
@@ -232,13 +230,12 @@ int ebitmap_read(struct ebitmap *e, void *fp)
                         printk(KERN_ERR "security: ebitmap: truncated map\n");
                         goto bad;
                 }
-                n = kmalloc(sizeof(*n), GFP_KERNEL);
+                n = kzalloc(sizeof(*n), GFP_KERNEL);
                 if (!n) {
                         printk(KERN_ERR "security: ebitmap: out of memory\n");
                         rc = -ENOMEM;
                         goto bad;
                 }
-                memset(n, 0, sizeof(*n));
 
                 n->startbit = le32_to_cpu(buf[0]);
 
diff --git a/security/selinux/ss/hashtab.c b/security/selinux/ss/hashtab.c
index 26661fcc00ce..24e5ec957630 100644
--- a/security/selinux/ss/hashtab.c
+++ b/security/selinux/ss/hashtab.c
@@ -15,11 +15,10 @@ struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, void *key),
         struct hashtab *p;
         u32 i;
 
-        p = kmalloc(sizeof(*p), GFP_KERNEL);
+        p = kzalloc(sizeof(*p), GFP_KERNEL);
         if (p == NULL)
                 return p;
 
-        memset(p, 0, sizeof(*p));
         p->size = size;
         p->nel = 0;
         p->hash_value = hash_value;
@@ -55,10 +54,9 @@ int hashtab_insert(struct hashtab *h, void *key, void *datum)
         if (cur && (h->keycmp(h, key, cur->key) == 0))
                 return -EEXIST;
 
-        newnode = kmalloc(sizeof(*newnode), GFP_KERNEL);
+        newnode = kzalloc(sizeof(*newnode), GFP_KERNEL);
         if (newnode == NULL)
                 return -ENOMEM;
-        memset(newnode, 0, sizeof(*newnode));
         newnode->key = key;
         newnode->datum = datum;
         if (prev) {
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c
index 8e6262d12aa9..2f5f539875f2 100644
--- a/security/selinux/ss/policydb.c
+++ b/security/selinux/ss/policydb.c
@@ -121,12 +121,11 @@ static int roles_init(struct policydb *p)
         int rc;
         struct role_datum *role;
 
-        role = kmalloc(sizeof(*role), GFP_KERNEL);
+        role = kzalloc(sizeof(*role), GFP_KERNEL);
         if (!role) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(role, 0, sizeof(*role));
         role->value = ++p->p_roles.nprim;
         if (role->value != OBJECT_R_VAL) {
                 rc = -EINVAL;
@@ -851,12 +850,11 @@ static int perm_read(struct policydb *p, struct hashtab *h, void *fp)
         __le32 buf[2];
         u32 len;
 
-        perdatum = kmalloc(sizeof(*perdatum), GFP_KERNEL);
+        perdatum = kzalloc(sizeof(*perdatum), GFP_KERNEL);
         if (!perdatum) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(perdatum, 0, sizeof(*perdatum));
 
         rc = next_entry(buf, fp, sizeof buf);
         if (rc < 0)
@@ -893,12 +891,11 @@ static int common_read(struct policydb *p, struct hashtab *h, void *fp)
         u32 len, nel;
         int i, rc;
 
-        comdatum = kmalloc(sizeof(*comdatum), GFP_KERNEL);
+        comdatum = kzalloc(sizeof(*comdatum), GFP_KERNEL);
         if (!comdatum) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(comdatum, 0, sizeof(*comdatum));
 
         rc = next_entry(buf, fp, sizeof buf);
         if (rc < 0)
@@ -950,10 +947,9 @@ static int read_cons_helper(struct constraint_node **nodep, int ncons,
 
         lc = NULL;
         for (i = 0; i < ncons; i++) {
-                c = kmalloc(sizeof(*c), GFP_KERNEL);
+                c = kzalloc(sizeof(*c), GFP_KERNEL);
                 if (!c)
                         return -ENOMEM;
-                memset(c, 0, sizeof(*c));
 
                 if (lc) {
                         lc->next = c;
@@ -969,10 +965,9 @@ static int read_cons_helper(struct constraint_node **nodep, int ncons,
                 le = NULL;
                 depth = -1;
                 for (j = 0; j < nexpr; j++) {
-                        e = kmalloc(sizeof(*e), GFP_KERNEL);
+                        e = kzalloc(sizeof(*e), GFP_KERNEL);
                         if (!e)
                                 return -ENOMEM;
-                        memset(e, 0, sizeof(*e));
 
                         if (le) {
                                 le->next = e;
@@ -1033,12 +1028,11 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp)
         u32 len, len2, ncons, nel;
         int i, rc;
 
-        cladatum = kmalloc(sizeof(*cladatum), GFP_KERNEL);
+        cladatum = kzalloc(sizeof(*cladatum), GFP_KERNEL);
         if (!cladatum) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(cladatum, 0, sizeof(*cladatum));
 
         rc = next_entry(buf, fp, sizeof(u32)*6);
         if (rc < 0)
@@ -1127,12 +1121,11 @@ static int role_read(struct policydb *p, struct hashtab *h, void *fp)
         __le32 buf[2];
         u32 len;
 
-        role = kmalloc(sizeof(*role), GFP_KERNEL);
+        role = kzalloc(sizeof(*role), GFP_KERNEL);
         if (!role) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(role, 0, sizeof(*role));
 
         rc = next_entry(buf, fp, sizeof buf);
         if (rc < 0)
@@ -1188,12 +1181,11 @@ static int type_read(struct policydb *p, struct hashtab *h, void *fp)
         __le32 buf[3];
         u32 len;
 
-        typdatum = kmalloc(sizeof(*typdatum),GFP_KERNEL);
+        typdatum = kzalloc(sizeof(*typdatum),GFP_KERNEL);
         if (!typdatum) {
                 rc = -ENOMEM;
                 return rc;
         }
-        memset(typdatum, 0, sizeof(*typdatum));
 
         rc = next_entry(buf, fp, sizeof buf);
         if (rc < 0)
@@ -1261,12 +1253,11 @@ static int user_read(struct policydb *p, struct hashtab *h, void *fp)
         __le32 buf[2];
         u32 len;
 
-        usrdatum = kmalloc(sizeof(*usrdatum), GFP_KERNEL);
+        usrdatum = kzalloc(sizeof(*usrdatum), GFP_KERNEL);
         if (!usrdatum) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(usrdatum, 0, sizeof(*usrdatum));
 
         rc = next_entry(buf, fp, sizeof buf);
         if (rc < 0)
@@ -1316,12 +1307,11 @@ static int sens_read(struct policydb *p, struct hashtab *h, void *fp)
         __le32 buf[2];
         u32 len;
 
-        levdatum = kmalloc(sizeof(*levdatum), GFP_ATOMIC);
+        levdatum = kzalloc(sizeof(*levdatum), GFP_ATOMIC);
         if (!levdatum) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(levdatum, 0, sizeof(*levdatum));
 
         rc = next_entry(buf, fp, sizeof buf);
         if (rc < 0)
@@ -1368,12 +1358,11 @@ static int cat_read(struct policydb *p, struct hashtab *h, void *fp)
         __le32 buf[3];
         u32 len;
 
-        catdatum = kmalloc(sizeof(*catdatum), GFP_ATOMIC);
+        catdatum = kzalloc(sizeof(*catdatum), GFP_ATOMIC);
         if (!catdatum) {
                 rc = -ENOMEM;
                 goto out;
         }
-        memset(catdatum, 0, sizeof(*catdatum));
 
         rc = next_entry(buf, fp, sizeof buf);
         if (rc < 0)
@@ -1567,12 +1556,11 @@ int policydb_read(struct policydb *p, void *fp)
         nel = le32_to_cpu(buf[0]);
         ltr = NULL;
         for (i = 0; i < nel; i++) {
-                tr = kmalloc(sizeof(*tr), GFP_KERNEL);
+                tr = kzalloc(sizeof(*tr), GFP_KERNEL);
                 if (!tr) {
                         rc = -ENOMEM;
                         goto bad;
                 }
-                memset(tr, 0, sizeof(*tr));
                 if (ltr) {
                         ltr->next = tr;
                 } else {
@@ -1593,12 +1581,11 @@ int policydb_read(struct policydb *p, void *fp)
         nel = le32_to_cpu(buf[0]);
         lra = NULL;
         for (i = 0; i < nel; i++) {
-                ra = kmalloc(sizeof(*ra), GFP_KERNEL);
+                ra = kzalloc(sizeof(*ra), GFP_KERNEL);
                 if (!ra) {
                         rc = -ENOMEM;
                         goto bad;
                 }
-                memset(ra, 0, sizeof(*ra));
                 if (lra) {
                         lra->next = ra;
                 } else {
@@ -1627,12 +1614,11 @@ int policydb_read(struct policydb *p, void *fp)
                 nel = le32_to_cpu(buf[0]);
                 l = NULL;
                 for (j = 0; j < nel; j++) {
-                        c = kmalloc(sizeof(*c), GFP_KERNEL);
+                        c = kzalloc(sizeof(*c), GFP_KERNEL);
                         if (!c) {
                                 rc = -ENOMEM;
                                 goto bad;
                         }
-                        memset(c, 0, sizeof(*c));
                         if (l) {
                                 l->next = c;
                         } else {
@@ -1743,12 +1729,11 @@ int policydb_read(struct policydb *p, void *fp)
                 if (rc < 0)
                         goto bad;
                 len = le32_to_cpu(buf[0]);
-                newgenfs = kmalloc(sizeof(*newgenfs), GFP_KERNEL);
+                newgenfs = kzalloc(sizeof(*newgenfs), GFP_KERNEL);
                 if (!newgenfs) {
                         rc = -ENOMEM;
                         goto bad;
                 }
-                memset(newgenfs, 0, sizeof(*newgenfs));
 
                 newgenfs->fstype = kmalloc(len + 1,GFP_KERNEL);
                 if (!newgenfs->fstype) {
@@ -1790,12 +1775,11 @@ int policydb_read(struct policydb *p, void *fp)
                                 goto bad;
                         len = le32_to_cpu(buf[0]);
 
-                        newc = kmalloc(sizeof(*newc), GFP_KERNEL);
+                        newc = kzalloc(sizeof(*newc), GFP_KERNEL);
                         if (!newc) {
                                 rc = -ENOMEM;
                                 goto bad;
                         }
-                        memset(newc, 0, sizeof(*newc));
 
                         newc->u.name = kmalloc(len + 1,GFP_KERNEL);
                         if (!newc->u.name) {
@@ -1843,12 +1827,11 @@ int policydb_read(struct policydb *p, void *fp)
                 nel = le32_to_cpu(buf[0]);
                 lrt = NULL;
                 for (i = 0; i < nel; i++) {
-                        rt = kmalloc(sizeof(*rt), GFP_KERNEL);
+                        rt = kzalloc(sizeof(*rt), GFP_KERNEL);
                         if (!rt) {
                                 rc = -ENOMEM;
                                 goto bad;
                         }
-                        memset(rt, 0, sizeof(*rt));
                         if (lrt)
                                 lrt->next = rt;
                         else
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;