[AUDIT] Update UML audit-syscall-{entry,exit} calls to new prototypes

This patch is for -mm only.  It should probably be included in git-audit,
and should be forwarded to Linus iff git-audit is.

It updates the audit-syscall-{entry,exit} calls to current -mm.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/arch/um/kernel/ptrace.c b/arch/um/kernel/ptrace.c
index 3a99ee6d94eb751c3703d83dfc1fcaf26af01e39..7b259a22447e6e1cbb9cfebafd0da531d67c4313 100644 (file)
--- a/arch/um/kernel/ptrace.c
+++ b/arch/um/kernel/ptrace.c
@@ -337,15 +337,18 @@ void syscall_trace(union uml_pt_regs *regs, int entryexit)
 
        if (unlikely(current->audit_context)) {
                if (!entryexit)
-                       audit_syscall_entry(current, 
-                                           UPT_SYSCALL_NR(&regs->regs),
-                                           UPT_SYSCALL_ARG1(&regs->regs),
-                                           UPT_SYSCALL_ARG2(&regs->regs),
-                                           UPT_SYSCALL_ARG3(&regs->regs),
-                                           UPT_SYSCALL_ARG4(&regs->regs));
-               else
-                       audit_syscall_exit(current, 
-                                          UPT_SYSCALL_RET(&regs->regs));
+                       audit_syscall_entry(current,
+                                            HOST_AUDIT_ARCH,
+                                           UPT_SYSCALL_NR(regs),
+                                           UPT_SYSCALL_ARG1(regs),
+                                           UPT_SYSCALL_ARG2(regs),
+                                           UPT_SYSCALL_ARG3(regs),
+                                           UPT_SYSCALL_ARG4(regs));
+               else {
+                        int res = UPT_SYSCALL_RET(regs);
+                       audit_syscall_exit(current, AUDITSC_RESULT(res),
+                                           res);
+                }
        }
 
        /* Fake a debug trap */

diff --git a/include/asm-um/ptrace-i386.h b/include/asm-um/ptrace-i386.h
index 9e47590ec293b7c9e444f8fd02e0ffd9f3f3b942..04222f35c43e2cd0a64b9b28e390be9953104ee6 100644 (file)
--- a/include/asm-um/ptrace-i386.h
+++ b/include/asm-um/ptrace-i386.h
@@ -6,6 +6,8 @@
 #ifndef __UM_PTRACE_I386_H
 #define __UM_PTRACE_I386_H
 
+#define HOST_AUDIT_ARCH AUDIT_ARCH_I386
+
 #include "sysdep/ptrace.h"
 #include "asm/ptrace-generic.h"
 

diff --git a/include/asm-um/ptrace-x86_64.h b/include/asm-um/ptrace-x86_64.h
index c34be39b78b2262277b6abdf2c38dd5e30afb6af..be51219a8ffe468a600dc8727f9a9b83e90c0f3d 100644 (file)
--- a/include/asm-um/ptrace-x86_64.h
+++ b/include/asm-um/ptrace-x86_64.h
@@ -14,6 +14,8 @@
 #include "asm/ptrace-generic.h"
 #undef signal_fault
 
+#define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64
+
 void signal_fault(struct pt_regs_subarch *regs, void *frame, char *where);
 
 #define FS_BASE (21 * sizeof(unsigned long))

diff --git a/include/asm-um/thread_info.h b/include/asm-um/thread_info.h
index bffb577bc54e3b88b1706a0c9e49d489e05bcd87..a10ea155907efbf3d455f21eec33b95bfa9239ad 100644 (file)
--- a/include/asm-um/thread_info.h
+++ b/include/asm-um/thread_info.h
@@ -72,12 +72,14 @@ static inline struct thread_info *current_thread_info(void)
                                         */
 #define TIF_RESTART_BLOCK      4
 #define TIF_MEMDIE             5
+#define TIF_SYSCALL_AUDIT      6
 
 #define _TIF_SYSCALL_TRACE     (1 << TIF_SYSCALL_TRACE)
 #define _TIF_SIGPENDING                (1 << TIF_SIGPENDING)
 #define _TIF_NEED_RESCHED      (1 << TIF_NEED_RESCHED)
 #define _TIF_POLLING_NRFLAG     (1 << TIF_POLLING_NRFLAG)
-#define _TIF_RESTART_BLOCK     (1 << TIF_RESTART_BLOCK)
+#define _TIF_MEMDIE            (1 << TIF_MEMDIE)
+#define _TIF_SYSCALL_AUDIT     (1 << TIF_SYSCALL_AUDIT)
 
 #endif
 

diff --git a/init/Kconfig b/init/Kconfig
index abe2682a6ca688b28a9aa70dd2bb1f0aaa737f8b..338d82aeda673f91d54cb2b817003a5b60e720a6 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -173,7 +173,7 @@ config AUDIT
 
 config AUDITSYSCALL
        bool "Enable system-call auditing support"
-       depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64)
+       depends on AUDIT && (X86 || PPC64 || ARCH_S390 || IA64 || UML)
        default y if SECURITY_SELINUX
        help
          Enable low-overhead system-call auditing infrastructure that