drop task argument of audit_syscall_{entry,exit}
Subsystems (6)
PATCH 5/14 drop task argument of audit_syscall_{entry,exit}
From: Al Viro <[email protected]>
Date: Wed Mar 29 20:23:36 2006 -0500
... it's always current, and that's a good thing - allows simpler locking.
Signed-off-by Al Viro <[email protected]>
---
arch/i386/kernel/ptrace.c | 7 +++---- arch/i386/kernel/vm86.c | 2 +- arch/ia64/kernel/ptrace.c | 4 ++-- arch/mips/kernel/ptrace.c | 4 ++-- arch/powerpc/kernel/ptrace.c | 5 ++--- arch/s390/kernel/ptrace.c | 5 ++--- arch/sparc64/kernel/ptrace.c | 5 ++--- arch/um/kernel/ptrace.c | 6 ++---- arch/x86_64/kernel/ptrace.c | 6 +++--- include/linux/audit.h | 8 ++++---- kernel/auditsc.c | 8 ++++---- 11 files changed, 27 insertions(+), 33 deletions(-)
5411be59db80333039386f3b1ccfe5eb9023a916
arch/i386/kernel/ptrace.c +3 -4
@@ -671,7 +671,7 @@ int do_syscall_trace(struct pt_regs *regif (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 *reg 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 ; }
arch/i386/kernel/vm86.c +1 -1
@@ -312,7 +312,7 @@ static void do_sys_vm86(struct kernel_vm/*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"
arch/ia64/kernel/ptrace.c +2 -2
@@ -1644,7 +1644,7 @@ syscall_trace_enter (long arg0, long arg 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 argif (success !=AUDITSC_SUCCESS ) result = -result; -audit_syscall_exit (current, success, result); +audit_syscall_exit (success, result); } if (test_thread_flag(TIF_SYSCALL_TRACE)
arch/mips/kernel/ptrace.c +2 -2
@@ -483,7 +483,7 @@ #endif 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 } 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 ]); }
arch/powerpc/kernel/ptrace.c +2 -3
@@ -538,7 +538,7 @@ #endifdo_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 @@ #ifdef CONFIG_PPC32#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)
arch/s390/kernel/ptrace.c +2 -3
@@ -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 } 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 ]); }
arch/sparc64/kernel/ptrace.c +2 -3
@@ -653,7 +653,7 @@ asmlinkage void syscall_trace(struct pt_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_ 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],
arch/um/kernel/ptrace.c +2 -4
@@ -275,15 +275,13 @@ void syscall_trace(union uml_pt_regs *reif (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)); }
arch/x86_64/kernel/ptrace.c +3 -3
@@ -600,12 +600,12 @@ asmlinkage void syscall_trace_enter(struif (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(stru 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))
include/linux/audit.h +4 -4
@@ -287,10 +287,10 @@ #ifdef CONFIG_AUDITSYSCALL/* Public API */ extern int audit_alloc (struct task_struct *task);extern void audit_free (struct task_struct *task); -extern void audit_syscall_entry (struct task_struct *task,int arch, +extern void audit_syscall_entry (int arch,int major,unsigned long a0,unsigned long a1,unsigned long a2,unsigned long a3); -extern void audit_syscall_exit (struct task_struct *task,int failed,long return_code); +extern void audit_syscall_exit (int failed,long return_code);extern void audit_getname (const char *name);extern void audit_putname (const char *name);extern void __audit_inode (const char *name,const struct inode *inode,unsigned flags);
@@ -323,8 +323,8 @@ extern int audit_set_macxattr(const char#else #define audit_alloc (t) ({ 0; })#define audit_free (t) do { ; } while (0) -#define audit_syscall_entry (t,ta,a,b,c,d,e) do { ; } while (0) -#define audit_syscall_exit (t,f,r) do { ; } while (0) +#define audit_syscall_entry (ta,a,b,c,d,e) do { ; } while (0) +#define audit_syscall_exit (f,r) do { ; } while (0)#define audit_getname (n) do { ; } while (0)#define audit_putname (n) do { ; } while (0)#define __audit_inode (n,i,f) do { ; } while (0)
kernel/auditsc.c +4 -4
@@ -736,10 +736,11 @@ void audit_free(struct task_struct *tsk)* will only be written if another part of the kernel requests that it * be written). */ -void audit_syscall_entry (struct task_struct *tsk,int arch,int major, +void audit_syscall_entry (int arch,int major,unsigned long a1,unsigned long a2,unsigned long a3,unsigned long a4) { +struct task_struct *tsk = current;struct audit_context *context = tsk->audit_context;enum audit_state state;
@@ -817,12 +818,11 @@ #endif* message), then write out the syscall information. In call cases, * free the names stored from getname(). */ -void audit_syscall_exit (struct task_struct *tsk,int valid,long return_code) +void audit_syscall_exit (int valid,long return_code) { +struct task_struct *tsk = current;struct audit_context *context; -/* tsk == current */ -get_task_struct (tsk);task_lock (tsk); context =audit_get_context (tsk, valid, return_code);
Signature · 1 line
1.3.0.g0080f