[fedora-arm] Fwd: [PATCH 2/2] ARM: audit: use only AUDIT_ARCH_ARM regardless of endianness

[Jon Masters]

Please apply to our Fedora kernels.

-------- Original Message --------
Subject: [PATCH 2/2] ARM: audit: use only AUDIT_ARCH_ARM regardless of
endianness
Date: Fri,  4 May 2012 17:53:52 +0100
From: Will Deacon <will.deacon at arm.com>
To: patches at arm.linux.org.uk
CC: stable at vger.kernel.org

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.

Cc: stable at vger.kernel.org
Signed-off-by: Will Deacon <will.deacon at arm.com>

KernelVersion: 3.4-rc5
---
 arch/arm/kernel/ptrace.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
index d8dbe9c..9650c14 100644
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
@@ -906,12 +906,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;
@@ -919,7 +913,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))
-- 
1.7.4.1

--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: Attached Message Part
URL: <http://lists.fedoraproject.org/pipermail/arm/attachments/20120504/5a69d7d0/attachment.ksh>