[PATCH] audit: define AUDIT_ARCH_OPENRISC

[PATCH] audit: define AUDIT_ARCH_OPENRISC

[Kees Cook]

When using audit on OpenRISC, an audit arch is needed. This defines
it and fixes a compile-time bug uncovered in linux-next, likely from a
cut/paste from an arch with 64/32-bit modes that defined arch_arch():
arch/openrisc/kernel/ptrace.c:190:2: error: implicit declaration of function 'audit_arch'

This replaces it with the newly defined AUDIT_ARCH_OPENRISC, since it
is only 32-bit, and currently only operates in big-endian mode.

Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jonas Bonn <jonas@southpole.se>
Signed-off-by: Kees Cook <keescook@chromium.org>
---
 arch/openrisc/kernel/ptrace.c |    2 +-
 include/linux/audit.h         |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/openrisc/kernel/ptrace.c b/arch/openrisc/kernel/ptrace.c
index e71781d..71a2a0c 100644
--- a/arch/openrisc/kernel/ptrace.c
+++ b/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/include/linux/audit.h b/include/linux/audit.h
index d3fe97a..df19592 100644
--- a/include/linux/audit.h
+++ b/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)
-- 
1.7.0.4


-- 
Kees Cook
Chrome OS Security

Re: [PATCH] audit: define AUDIT_ARCH_OPENRISC

[Jonas Bonn]

On 09/21/2012 12:46 AM, Kees Cook wrote:
> When using audit on OpenRISC, an audit arch is needed. This defines
> it and fixes a compile-time bug uncovered in linux-next, likely from a
> cut/paste from an arch with 64/32-bit modes that defined arch_arch():
> arch/openrisc/kernel/ptrace.c:190:2: error: implicit declaration of function 'audit_arch'
>
> This replaces it with the newly defined AUDIT_ARCH_OPENRISC, since it
> is only 32-bit, and currently only operates in big-endian mode.

Looks good.  Will queue it up for 3.7.
Thanks,
Jonas