Commit 91397401 authored by Eric Paris's avatar Eric Paris
Browse files

ARCH: AUDIT: audit_syscall_entry() should not require the arch 



We have a function where the arch can be queried, syscall_get_arch().
So rather than have every single piece of arch specific code use and/or
duplicate syscall_get_arch(), just have the audit code use the
syscall_get_arch() code.

Based-on-patch-by: default avatarRichard Briggs <rgb@redhat.com>
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Cc: linux-alpha@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-ia64@vger.kernel.org
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: linux-mips@linux-mips.org
Cc: linux@lists.openrisc.net
Cc: linux-parisc@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s390@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: linux-xtensa@linux-xtensa.org
Cc: x86@kernel.org
parent ce5d1128

arch/alpha/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ asmlinkage unsigned long syscall_trace_enter(void) 
	if (test_thread_flag(TIF_SYSCALL_TRACE) &&

	    tracehook_report_syscall_entry(current_pt_regs()))

		ret = -1UL;

	audit_syscall_entry(AUDIT_ARCH_ALPHA, regs->r0, regs->r16, regs->r17, regs->r18, regs->r19);

	audit_syscall_entry(regs->r0, regs->r16, regs->r17, regs->r18, regs->r19);

	return ret ?: current_pt_regs()->r0;

}

arch/arm/kernel/ptrace.c

+2 −2
Original line number Diff line number Diff line
@@ -944,8 +944,8 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno) 
	if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))

		trace_sys_enter(regs, scno);



	audit_syscall_entry(AUDIT_ARCH_ARM, scno, regs->ARM_r0, regs->ARM_r1,

			    regs->ARM_r2, regs->ARM_r3);

	audit_syscall_entry(scno, regs->ARM_r0, regs->ARM_r1, regs->ARM_r2,

			    regs->ARM_r3);



	return scno;

}

arch/ia64/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,7 @@ syscall_trace_enter (long arg0, long arg1, long arg2, long arg3, 
		ia64_sync_krbs();





	audit_syscall_entry(AUDIT_ARCH_IA64, regs.r15, arg0, arg1, arg2, arg3);

	audit_syscall_entry(regs.r15, arg0, arg1, arg2, arg3);



	return 0;

}

arch/microblaze/kernel/ptrace.c

+1 −2
Original line number Diff line number Diff line
@@ -147,8 +147,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) 
		 */

		ret = -1L;



	audit_syscall_entry(EM_MICROBLAZE, regs->r12, regs->r5, regs->r6,

			    regs->r7, regs->r8);

	audit_syscall_entry(regs->r12, regs->r5, regs->r6, regs->r7, regs->r8);



	return ret ?: regs->r12;

}

arch/mips/kernel/ptrace.c

+1 −3
Original line number Diff line number Diff line
@@ -649,9 +649,7 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall) 
	if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))

		trace_sys_enter(regs, regs->regs[2]);



	audit_syscall_entry(syscall_get_arch(),

			    syscall,

			    regs->regs[4], regs->regs[5],

	audit_syscall_entry(syscall, regs->regs[4], regs->regs[5],

			    regs->regs[6], regs->regs[7]);

	return syscall;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE