[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>
This commit is contained in:
committed by
Linus Torvalds
parent
0d078f6f96
commit
89d155ef62
@@ -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;
|
||||
|
Reference in New Issue
Block a user