diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-08-06 19:03:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-06 21:01:12 -0400 |
commit | bab5e2d6522bc3cb892c1e8aaafecab05bed9d85 (patch) | |
tree | 26993043e7a0a4e3786e221792d997b49d803ae0 /kernel | |
parent | 85417aef44fc58b08773117ceb1bc6ca5684e973 (diff) |
kernel/auditfilter.c: replace count*size kmalloc by kcalloc
kcalloc manages count*sizeof overflow.
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/auditfilter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 8e9bc9c3dbb7..c447cd9848d1 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c | |||
@@ -106,7 +106,7 @@ static inline struct audit_entry *audit_init_entry(u32 field_count) | |||
106 | if (unlikely(!entry)) | 106 | if (unlikely(!entry)) |
107 | return NULL; | 107 | return NULL; |
108 | 108 | ||
109 | fields = kzalloc(sizeof(*fields) * field_count, GFP_KERNEL); | 109 | fields = kcalloc(field_count, sizeof(*fields), GFP_KERNEL); |
110 | if (unlikely(!fields)) { | 110 | if (unlikely(!fields)) { |
111 | kfree(entry); | 111 | kfree(entry); |
112 | return NULL; | 112 | return NULL; |
@@ -160,7 +160,7 @@ static __u32 *classes[AUDIT_SYSCALL_CLASSES]; | |||
160 | 160 | ||
161 | int __init audit_register_class(int class, unsigned *list) | 161 | int __init audit_register_class(int class, unsigned *list) |
162 | { | 162 | { |
163 | __u32 *p = kzalloc(AUDIT_BITMASK_SIZE * sizeof(__u32), GFP_KERNEL); | 163 | __u32 *p = kcalloc(AUDIT_BITMASK_SIZE, sizeof(__u32), GFP_KERNEL); |
164 | if (!p) | 164 | if (!p) |
165 | return -ENOMEM; | 165 | return -ENOMEM; |
166 | while (*list != ~0U) { | 166 | while (*list != ~0U) { |