kernel/auditsc.c: use kzalloc instead of kmalloc+memset (3f68613f) · Commits · 戴 / test

In audit_alloc_context() use kzalloc instead of kmalloc+memset. Also rename audit_zero_context() to audit_set_context(), to represent it's inner workings properly. [akpm@linux-foundation.org: remove audit_set_context() altogether - fold it into its caller] Signed-off-by:

Rakib Mullick <rakib.mullick@gmail.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Eric Paris <eparis@redhat.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

kernel/auditsc.c

+4 −10

Original line number	Diff line number	Diff line
		@@ -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;

Admin message