projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/audit
[cascardo/linux.git]
/
kernel
/
auditfilter.c
diff --git
a/kernel/auditfilter.c
b/kernel/auditfilter.c
index
81c94d7
..
72e1660
100644
(file)
--- a/
kernel/auditfilter.c
+++ b/
kernel/auditfilter.c
@@
-121,7
+121,7
@@
static inline struct audit_entry *audit_init_entry(u32 field_count)
if (unlikely(!entry))
return NULL;
if (unlikely(!entry))
return NULL;
- fields = k
zalloc(sizeof(*fields) * field_count
, GFP_KERNEL);
+ fields = k
calloc(field_count, sizeof(*fields)
, GFP_KERNEL);
if (unlikely(!fields)) {
kfree(entry);
return NULL;
if (unlikely(!fields)) {
kfree(entry);
return NULL;
@@
-175,7
+175,7
@@
static __u32 *classes[AUDIT_SYSCALL_CLASSES];
int __init audit_register_class(int class, unsigned *list)
{
int __init audit_register_class(int class, unsigned *list)
{
- __u32 *p = k
zalloc(AUDIT_BITMASK_SIZE *
sizeof(__u32), GFP_KERNEL);
+ __u32 *p = k
calloc(AUDIT_BITMASK_SIZE,
sizeof(__u32), GFP_KERNEL);
if (!p)
return -ENOMEM;
while (*list != ~0U) {
if (!p)
return -ENOMEM;
while (*list != ~0U) {