Merge branch 'audit.b10' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current

* 'audit.b10' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
  [PATCH] Audit Filter Performance
  [PATCH] Rework of IPC auditing
  [PATCH] More user space subject labels
  [PATCH] Reworked patch for labels on user space messages
  [PATCH] change lspp ipc auditing
  [PATCH] audit inode patch
  [PATCH] support for context based audit filtering, part 2
  [PATCH] support for context based audit filtering
  [PATCH] no need to wank with task_lock() and pinning task down in audit_syscall_exit()
  [PATCH] drop task argument of audit_syscall_{entry,exit}
  [PATCH] drop gfp_mask in audit_log_exit()
  [PATCH] move call of audit_free() into do_exit()
  [PATCH] sockaddr patch
  [PATCH] deal with deadlocks in audit_free()

9 files changed, 19 insertions, 25 deletions

diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index 506462ef36a0..fd7eaf7866e0 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -671,7 +671,7 @@ int do_syscall_trace(struct pt_regs *regs, int entryexit)
 
         if (unlikely(current->audit_context)) {
                 if (entryexit)
-                        audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
+                        audit_syscall_exit(AUDITSC_RESULT(regs->eax),
                                                 regs->eax);
                 /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only
                  * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is
@@ -720,14 +720,13 @@ int do_syscall_trace(struct pt_regs *regs, int entryexit)
         ret = is_sysemu;
 out:
         if (unlikely(current->audit_context) && !entryexit)
-                audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax,
+                audit_syscall_entry(AUDIT_ARCH_I386, regs->orig_eax,
                                     regs->ebx, regs->ecx, regs->edx, regs->esi);
         if (ret == 0)
                 return 0;
 
         regs->orig_eax = -1; /* force skip of syscall restarting */
         if (unlikely(current->audit_context))
-                audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
-                                regs->eax);
+                audit_syscall_exit(AUDITSC_RESULT(regs->eax), regs->eax);
         return 1;
 }
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index aee14fafd13d..00e0118e717c 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -312,7 +312,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
 
         /*call audit_syscall_exit since we do not exit via the normal paths */
         if (unlikely(current->audit_context))
-                audit_syscall_exit(current, AUDITSC_RESULT(eax), eax);
+                audit_syscall_exit(AUDITSC_RESULT(eax), eax);
 
         __asm__ __volatile__(
                 "movl %0,%%esp\n\t"
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 9887c8787e7a..e61e15e28d8b 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1644,7 +1644,7 @@ syscall_trace_enter (long arg0, long arg1, long arg2, long arg3,
                         arch = AUDIT_ARCH_IA64;
                 }
 
-                audit_syscall_entry(current, arch, syscall, arg0, arg1, arg2, arg3);
+                audit_syscall_entry(arch, syscall, arg0, arg1, arg2, arg3);
         }
 
 }
@@ -1662,7 +1662,7 @@ syscall_trace_leave (long arg0, long arg1, long arg2, long arg3,
 
                 if (success != AUDITSC_SUCCESS)
                         result = -result;
-                audit_syscall_exit(current, success, result);
+                audit_syscall_exit(success, result);
         }
 
         if (test_thread_flag(TIF_SYSCALL_TRACE)
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index f3106d0771b0..9b4733c12395 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -483,7 +483,7 @@ static inline int audit_arch(void)
 asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
 {
         if (unlikely(current->audit_context) && entryexit)
-                audit_syscall_exit(current, AUDITSC_RESULT(regs->regs[2]),
+                audit_syscall_exit(AUDITSC_RESULT(regs->regs[2]),
                                    regs->regs[2]);
 
         if (!(current->ptrace & PT_PTRACED))
@@ -507,7 +507,7 @@ asmlinkage void do_syscall_trace(struct pt_regs *regs, int entryexit)
         }
  out:
         if (unlikely(current->audit_context) && !entryexit)
-                audit_syscall_entry(current, audit_arch(), regs->regs[2],
+                audit_syscall_entry(audit_arch(), regs->regs[2],
                                     regs->regs[4], regs->regs[5],
                                     regs->regs[6], regs->regs[7]);
 }
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index bcb83574335b..4a677d1bd4ef 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -538,7 +538,7 @@ void do_syscall_trace_enter(struct pt_regs *regs)
                 do_syscall_trace();
 
         if (unlikely(current->audit_context))
-                audit_syscall_entry(current,
+                audit_syscall_entry(
 #ifdef CONFIG_PPC32
                                     AUDIT_ARCH_PPC,
 #else
@@ -556,8 +556,7 @@ void do_syscall_trace_leave(struct pt_regs *regs)
 #endif
 
         if (unlikely(current->audit_context))
-                audit_syscall_exit(current,
-                                   (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
+                audit_syscall_exit((regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
                                    regs->result);
 
         if ((test_thread_flag(TIF_SYSCALL_TRACE)
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index 37dfe33dab73..8f36504075ed 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -734,7 +734,7 @@ asmlinkage void
 syscall_trace(struct pt_regs *regs, int entryexit)
 {
         if (unlikely(current->audit_context) && entryexit)
-                audit_syscall_exit(current, AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
+                audit_syscall_exit(AUDITSC_RESULT(regs->gprs[2]), regs->gprs[2]);
 
         if (!test_thread_flag(TIF_SYSCALL_TRACE))
                 goto out;
@@ -761,8 +761,7 @@ syscall_trace(struct pt_regs *regs, int entryexit)
         }
  out:
         if (unlikely(current->audit_context) && !entryexit)
-                audit_syscall_entry(current, 
-                                    test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,
+                audit_syscall_entry(test_thread_flag(TIF_31BIT)?AUDIT_ARCH_S390:AUDIT_ARCH_S390X,
                                     regs->gprs[2], regs->orig_gpr2, regs->gprs[3],
                                     regs->gprs[4], regs->gprs[5]);
 }
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c
index 49e6dedd027d..d31975e6d6f6 100644
--- a/arch/sparc64/kernel/ptrace.c
+++ b/arch/sparc64/kernel/ptrace.c
@@ -653,7 +653,7 @@ asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p)
                 if (unlikely(tstate & (TSTATE_XCARRY | TSTATE_ICARRY)))
                         result = AUDITSC_FAILURE;
 
-                audit_syscall_exit(current, result, regs->u_regs[UREG_I0]);
+                audit_syscall_exit(result, regs->u_regs[UREG_I0]);
         }
 
         if (!(current->ptrace & PT_PTRACED))
@@ -677,8 +677,7 @@ asmlinkage void syscall_trace(struct pt_regs *regs, int syscall_exit_p)
 
 out:
         if (unlikely(current->audit_context) && !syscall_exit_p)
-                audit_syscall_entry(current,
-                                    (test_thread_flag(TIF_32BIT) ?
+                audit_syscall_entry((test_thread_flag(TIF_32BIT) ?
                                      AUDIT_ARCH_SPARC :
                                      AUDIT_ARCH_SPARC64),
                                     regs->u_regs[UREG_G1],
diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index 60d2eda995c1..9a77fb3c269d 100644
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -275,15 +275,13 @@ void syscall_trace(union uml_pt_regs *regs, int entryexit)
 
         if (unlikely(current->audit_context)) {
                 if (!entryexit)
-                        audit_syscall_entry(current,
-                                            HOST_AUDIT_ARCH,
+                        audit_syscall_entry(HOST_AUDIT_ARCH,
                                             UPT_SYSCALL_NR(regs),
                                             UPT_SYSCALL_ARG1(regs),
                                             UPT_SYSCALL_ARG2(regs),
                                             UPT_SYSCALL_ARG3(regs),
                                             UPT_SYSCALL_ARG4(regs));
-                else audit_syscall_exit(current,
-                                        AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
+                else audit_syscall_exit(AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
                                         UPT_SYSCALL_RET(regs));
         }
 
diff --git a/arch/x86_64/kernel/ptrace.c b/arch/x86_64/kernel/ptrace.c
index da8e7903d817..2d50024c9f30 100644
--- a/arch/x86_64/kernel/ptrace.c
+++ b/arch/x86_64/kernel/ptrace.c
@@ -600,12 +600,12 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
 
         if (unlikely(current->audit_context)) {
                 if (test_thread_flag(TIF_IA32)) {
-                        audit_syscall_entry(current, AUDIT_ARCH_I386,
+                        audit_syscall_entry(AUDIT_ARCH_I386,
                                             regs->orig_rax,
                                             regs->rbx, regs->rcx,
                                             regs->rdx, regs->rsi);
                 } else {
-                        audit_syscall_entry(current, AUDIT_ARCH_X86_64,
+                        audit_syscall_entry(AUDIT_ARCH_X86_64,
                                             regs->orig_rax,
                                             regs->rdi, regs->rsi,
                                             regs->rdx, regs->r10);
@@ -616,7 +616,7 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
 asmlinkage void syscall_trace_leave(struct pt_regs *regs)
 {
         if (unlikely(current->audit_context))
-                audit_syscall_exit(current, AUDITSC_RESULT(regs->rax), regs->rax);
+                audit_syscall_exit(AUDITSC_RESULT(regs->rax), regs->rax);
 
         if ((test_thread_flag(TIF_SYSCALL_TRACE)
              || test_thread_flag(TIF_SINGLESTEP))