diff options
author | Rakib Mullick <rakib.mullick@gmail.com> | 2013-04-07 06:14:18 -0400 |
---|---|---|
committer | Eric Paris <eparis@redhat.com> | 2013-04-10 15:18:24 -0400 |
commit | 17c6ee707a32c8e67861a442f387def5b7f64cec (patch) | |
tree | df3d8b2164badcd26d8079c769196860dc2ea7a4 /kernel | |
parent | 2950fa9d3291b90e9b7663b6a409ea37a97a5e35 (diff) |
auditsc: Use kzalloc instead of kmalloc+memset.
In function audit_alloc_context(), use kzalloc, instead of kmalloc+memset. Patch also renames audit_zero_context() to
audit_set_context(), to represent it's inner workings properly.
Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/auditsc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index d57ad32db367..9dc3bae9793d 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -1048,10 +1048,9 @@ static inline void audit_free_aux(struct audit_context *context) | |||
1048 | } | 1048 | } |
1049 | } | 1049 | } |
1050 | 1050 | ||
1051 | static inline void audit_zero_context(struct audit_context *context, | 1051 | static inline void audit_set_context(struct audit_context *context, |
1052 | enum audit_state state) | 1052 | enum audit_state state) |
1053 | { | 1053 | { |
1054 | memset(context, 0, sizeof(*context)); | ||
1055 | context->state = state; | 1054 | context->state = state; |
1056 | context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0; | 1055 | context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0; |
1057 | } | 1056 | } |
@@ -1060,9 +1059,10 @@ static inline struct audit_context *audit_alloc_context(enum audit_state state) | |||
1060 | { | 1059 | { |
1061 | struct audit_context *context; | 1060 | struct audit_context *context; |
1062 | 1061 | ||
1063 | if (!(context = kmalloc(sizeof(*context), GFP_KERNEL))) | 1062 | context = kzalloc(sizeof(*context), GFP_KERNEL); |
1063 | if (!context) | ||
1064 | return NULL; | 1064 | return NULL; |
1065 | audit_zero_context(context, state); | 1065 | audit_set_context(context, state); |
1066 | INIT_LIST_HEAD(&context->killed_trees); | 1066 | INIT_LIST_HEAD(&context->killed_trees); |
1067 | INIT_LIST_HEAD(&context->names_list); | 1067 | INIT_LIST_HEAD(&context->names_list); |
1068 | return context; | 1068 | return context; |