move call of audit_free() into do_exit()
Subsystems (4)
PATCH 3/14 move call of audit_free() into do_exit()
From: Al Viro <[email protected]>
Date: Wed Mar 29 20:30:19 2006 -0500
Signed-off-by Al Viro <[email protected]>
---
kernel/auditsc.c | 9 +-------- kernel/exit.c | 3 +++ kernel/fork.c | 2 -- 3 files changed, 4 insertions(+), 10 deletions(-)
fa84cb935d4ec601528f5e2f0d5d31e7876a5044
kernel/auditsc.c +1 -8
@@ -698,19 +698,12 @@ static void audit_log_exit(struct audit_* audit_free - free a per-task audit context * @tsk: task whose audit context block to free * -* Called from copy_process and __put_task_struct. +* Called from copy_process and do_exit */ void audit_free (struct task_struct *tsk) {struct audit_context *context; -/* -* No need to lock the task - when we execute audit_free() -* then the task has no external references anymore, and -* we are tearing it down. (The locking also confuses -* DEBUG_LOCKDEP - this freeing may occur in softirq -* contexts as well, via RCU.) -*/ context =audit_get_context (tsk,0 ,0 );if (likely (!context))return ;
kernel/exit.c +3 -0
@@ -35,6 +35,7 @@ #include <linux/mutex.h>#include <linux/futex.h> #include <linux/compat.h> #include <linux/pipe_fs_i.h> +#include <linux/audit.h> /* for audit_free() */ #include <asm/uaccess.h> #include <asm/unistd.h>
@@ -910,6 +911,8 @@ #ifdef CONFIG_COMPATif (unlikely (tsk->compat_robust_list))compat_exit_robust_list (tsk);#endif +if (unlikely (tsk->audit_context)) +audit_free (tsk);exit_mm (tsk);exit_sem (tsk);
kernel/fork.c +0 -2
@@ -114,8 +114,6 @@ void __put_task_struct(struct task_strucWARN_ON (atomic_read (&tsk->usage));WARN_ON (tsk == current); -if (unlikely (tsk->audit_context)) -audit_free (tsk);security_task_free (tsk);free_uid (tsk->user);put_group_info (tsk->group_info);
Signature · 1 line
1.3.0.g0080f