[PATCH] no need to wank with task_lock() and pinning task down in audit_syscall_exit()
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 30 Mar 2006 01:26:24 +0000 (20:26 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 1 May 2006 10:06:21 +0000 (06:06 -0400)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
kernel/auditsc.c

index 7ed82b088e4b8c1c34bf58162dbbe7fa6e37a971..8aca4ab4aa2793e1c211ecbe21751d541cd4ca39 100644 (file)
@@ -329,7 +329,6 @@ static enum audit_state audit_filter_syscall(struct task_struct *tsk,
        return AUDIT_BUILD_CONTEXT;
 }
 
-/* This should be called with task_lock() held. */
 static inline struct audit_context *audit_get_context(struct task_struct *tsk,
                                                      int return_valid,
                                                      int return_code)
@@ -823,15 +822,10 @@ void audit_syscall_exit(int valid, long return_code)
        struct task_struct *tsk = current;
        struct audit_context *context;
 
-       get_task_struct(tsk);
-       task_lock(tsk);
        context = audit_get_context(tsk, valid, return_code);
-       task_unlock(tsk);
 
-       /* Not having a context here is ok, since the parent may have
-        * called __put_task_struct. */
        if (likely(!context))
-               goto out;
+               return;
 
        if (context->in_syscall && context->auditable)
                audit_log_exit(context, tsk);
@@ -849,8 +843,6 @@ void audit_syscall_exit(int valid, long return_code)
                audit_free_aux(context);
                tsk->audit_context = context;
        }
- out:
-       put_task_struct(tsk);
 }
 
 /**