From: Will Deacon <will.deacon@arm.com>
Date: Fri, 4 May 2012 16:53:52 +0000 (+0100)
Subject: ARM: 7412/1: audit: use only AUDIT_ARCH_ARM regardless of endianness
X-Git-Tag: v3.3.6~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=246301f454256967c5845a3e076c05ce488ff910;p=karo-tx-linux.git

ARM: 7412/1: audit: use only AUDIT_ARCH_ARM regardless of endianness

commit 2f978366984a418f38fcf44137be1fbc5a89cfd9 upstream.

The machine endianness has no direct correspondence to the syscall ABI,
so use only AUDIT_ARCH_ARM when identifying the ABI to the audit tools
in userspace.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index b139270a30fe..f5ce8ab0755a 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -905,12 +905,6 @@ long arch_ptrace(struct task_struct *child, long request,
 	return ret;
 }
 
-#ifdef __ARMEB__
-#define AUDIT_ARCH_NR AUDIT_ARCH_ARMEB
-#else
-#define AUDIT_ARCH_NR AUDIT_ARCH_ARM
-#endif
-
 asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
 {
 	unsigned long ip;
@@ -918,7 +912,7 @@ asmlinkage int syscall_trace(int why, struct pt_regs *regs, int scno)
 	if (why)
 		audit_syscall_exit(regs);
 	else
-		audit_syscall_entry(AUDIT_ARCH_NR, scno, regs->ARM_r0,
+		audit_syscall_entry(AUDIT_ARCH_ARM, scno, regs->ARM_r0,
 				    regs->ARM_r1, regs->ARM_r2, regs->ARM_r3);
 
 	if (!test_thread_flag(TIF_SYSCALL_TRACE))