projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Input: ucb1x00 - do not access input_dev->private directly
[powerpc.git]
/
security
/
selinux
/
ss
/
conditional.c
diff --git
a/security/selinux/ss/conditional.c
b/security/selinux/ss/conditional.c
index
daf2880
..
d2737ed
100644
(file)
--- 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;
u32 len;
int rc;
- booldatum = k
m
alloc(sizeof(struct cond_bool_datum), GFP_KERNEL);
+ booldatum = k
z
alloc(sizeof(struct cond_bool_datum), GFP_KERNEL);
if (!booldatum)
return -1;
if (!booldatum)
return -1;
- memset(booldatum, 0, sizeof(struct cond_bool_datum));
rc = next_entry(buf, fp, sizeof buf);
if (rc < 0)
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;
}
goto err;
}
- list = k
m
alloc(sizeof(struct cond_av_list), GFP_KERNEL);
+ list = k
z
alloc(sizeof(struct cond_av_list), GFP_KERNEL);
if (!list)
goto err;
if (!list)
goto err;
- memset(list, 0, sizeof(*list));
list->node = node_ptr;
if (!data->head)
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;
if (rc < 0)
goto err;
- expr = k
m
alloc(sizeof(struct cond_expr), GFP_KERNEL);
+ expr = k
z
alloc(sizeof(struct cond_expr), GFP_KERNEL);
if (!expr) {
goto err;
}
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]);
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++) {
len = le32_to_cpu(buf[0]);
for (i = 0; i < len; i++) {
- node = k
m
alloc(sizeof(struct cond_node), GFP_KERNEL);
+ node = k
z
alloc(sizeof(struct cond_node), GFP_KERNEL);
if (!node)
goto err;
if (!node)
goto err;
- memset(node, 0, sizeof(struct cond_node));
if (cond_read_node(p, node, fp) != 0)
goto err;
if (cond_read_node(p, node, fp) != 0)
goto err;