From 1fc997e9d499dfa32e13031ecd652f63f64b07be Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Thu, 20 Sep 2012 15:46:06 -0700 Subject: [PATCH] --- yaml --- r: 334188 b: refs/heads/master c: e2bebb4ae6d9ac4ffc524db67f7ecb205a173f77 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/openrisc/kernel/ptrace.c | 2 +- trunk/include/linux/audit.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a95423b95200..355e7e7a43a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 807607f79b9d0ed81561746e4e1121905e75cf0f +refs/heads/master: e2bebb4ae6d9ac4ffc524db67f7ecb205a173f77 diff --git a/trunk/arch/openrisc/kernel/ptrace.c b/trunk/arch/openrisc/kernel/ptrace.c index e71781d24b0e..71a2a0c34c65 100644 --- a/trunk/arch/openrisc/kernel/ptrace.c +++ b/trunk/arch/openrisc/kernel/ptrace.c @@ -187,7 +187,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) */ ret = -1L; - audit_syscall_entry(audit_arch(), regs->gpr[11], + audit_syscall_entry(AUDIT_ARCH_OPENRISC, regs->gpr[11], regs->gpr[3], regs->gpr[4], regs->gpr[5], regs->gpr[6]); diff --git a/trunk/include/linux/audit.h b/trunk/include/linux/audit.h index 36abf2aa7e68..95d98308c06e 100644 --- a/trunk/include/linux/audit.h +++ b/trunk/include/linux/audit.h @@ -337,6 +337,7 @@ enum { #define AUDIT_ARCH_MIPSEL (EM_MIPS|__AUDIT_ARCH_LE) #define AUDIT_ARCH_MIPS64 (EM_MIPS|__AUDIT_ARCH_64BIT) #define AUDIT_ARCH_MIPSEL64 (EM_MIPS|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_OPENRISC (EM_OPENRISC) #define AUDIT_ARCH_PARISC (EM_PARISC) #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) #define AUDIT_ARCH_PPC (EM_PPC)