---

yaml --- r: 365319 b: refs/heads/master c: 3f68613 h: refs/heads/master i: 365317: 4cf2fcf 365315: 3b121d2 365311: 6535af6 v: v3
git-mirror · Apr 29, 2013 · 6ca3a8a · 6ca3a8a
1 parent 3fe2c70
commit 6ca3a8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b5c5442bb6bce0c67701d55124be561043a51faf
+refs/heads/master: 3f68613f39cdc242fa2e872ac04a802e7cc7b7cb
diff --git a/trunk/kernel/auditsc.c b/trunk/kernel/auditsc.c
@@ -1034,21 +1034,15 @@ static inline void audit_free_aux(struct audit_context *context)
 	}
 }
 
-static inline void audit_zero_context(struct audit_context *context,
-				      enum audit_state state)
-{
-	memset(context, 0, sizeof(*context));
-	context->state      = state;
-	context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
-}
-
 static inline struct audit_context *audit_alloc_context(enum audit_state state)
 {
 	struct audit_context *context;
 
-	if (!(context = kmalloc(sizeof(*context), GFP_KERNEL)))
+	context = kzalloc(sizeof(*context), GFP_KERNEL);
+	if (!context)
 		return NULL;
-	audit_zero_context(context, state);
+	context->state = state;
+	context->prio = state == AUDIT_RECORD_CONTEXT ? ~0ULL : 0;
 	INIT_LIST_HEAD(&context->killed_trees);
 	INIT_LIST_HEAD(&context->names_list);
 	return context;