[AUDIT] Don't allow ptrace to fool auditing, log arch of audited syscalls.
We were calling ptrace_notify() after auditing the syscall and arguments,
but the debugger could have _changed_ them before the syscall was actually
invoked. Reorder the calls to fix that.
While we're touching ever call to audit_syscall_entry(), we also make it
take an extra argument: the architecture of the syscall which was made,
because some architectures allow more than one type of syscall.
Also add an explicit success/failure flag to audit_syscall_exit(), for
the benefit of architectures which return that in a condition register
rather than only returning a single register.
Change type of syscall return value to 'long' not 'int'.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
diff --git a/arch/ia64/kernel/ptrace.c b/arch/ia64/kernel/ptrace.c
index 55789fc..8dde0b1 100644
--- a/arch/ia64/kernel/ptrace.c
+++ b/arch/ia64/kernel/ptrace.c
@@ -1595,20 +1595,25 @@
long arg4, long arg5, long arg6, long arg7,
struct pt_regs regs)
{
- long syscall;
-
- if (unlikely(current->audit_context)) {
- if (IS_IA32_PROCESS(®s))
- syscall = regs.r1;
- else
- syscall = regs.r15;
-
- audit_syscall_entry(current, syscall, arg0, arg1, arg2, arg3);
- }
-
- if (test_thread_flag(TIF_SYSCALL_TRACE)
+ if (test_thread_flag(TIF_SYSCALL_TRACE)
&& (current->ptrace & PT_PTRACED))
syscall_trace();
+
+ if (unlikely(current->audit_context)) {
+ long syscall;
+ int arch;
+
+ if (IS_IA32_PROCESS(®s)) {
+ syscall = regs.r1;
+ arch = AUDIT_ARCH_I386;
+ } else {
+ syscall = regs.r15;
+ arch = AUDIT_ARCH_IA64;
+ }
+
+ audit_syscall_entry(current, arch, syscall, arg0, arg1, arg2, arg3);
+ }
+
}
/* "asmlinkage" so the input arguments are preserved... */
@@ -1619,7 +1624,7 @@
struct pt_regs regs)
{
if (unlikely(current->audit_context))
- audit_syscall_exit(current, regs.r8);
+ audit_syscall_exit(current, AUDITSC_RESULT(regs.r10), regs.r8);
if (test_thread_flag(TIF_SYSCALL_TRACE)
&& (current->ptrace & PT_PTRACED))