diff options
author | Richard Guy Briggs <rgb@redhat.com> | 2014-12-09 15:37:07 -0500 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-12-12 04:14:08 -0500 |
commit | 63f13448d81c910a284b096149411a719cbed501 (patch) | |
tree | 394591af3558cc6cde82f53dfb0009a3c14664c7 | |
parent | ec2aef5a8d3c14272f7a2d29b34f1f8e71f2be5b (diff) |
powerpc: add little endian flag to syscall_get_arch()
Since both ppc and ppc64 have LE variants which are now reported by uname, add
that flag (__AUDIT_ARCH_LE) to syscall_get_arch() and add AUDIT_ARCH_PPC64LE
variant.
Without this, perf trace and auditctl fail.
Mainline kernel reports ppc64le (per a058801) but there is no matching
AUDIT_ARCH_PPC64LE.
Since 32-bit PPC LE is not supported by audit, don't advertise it in
AUDIT_ARCH_PPC* variants.
See:
https://www.redhat.com/archives/linux-audit/2014-August/msg00082.html
https://www.redhat.com/archives/linux-audit/2014-December/msg00004.html
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r-- | arch/powerpc/include/asm/syscall.h | 6 | ||||
-rw-r--r-- | include/uapi/linux/audit.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/syscall.h b/arch/powerpc/include/asm/syscall.h index 6240698fee9a..ff21b7a2f0cc 100644 --- a/arch/powerpc/include/asm/syscall.h +++ b/arch/powerpc/include/asm/syscall.h | |||
@@ -90,6 +90,10 @@ static inline void syscall_set_arguments(struct task_struct *task, | |||
90 | 90 | ||
91 | static inline int syscall_get_arch(void) | 91 | static inline int syscall_get_arch(void) |
92 | { | 92 | { |
93 | return is_32bit_task() ? AUDIT_ARCH_PPC : AUDIT_ARCH_PPC64; | 93 | int arch = is_32bit_task() ? AUDIT_ARCH_PPC : AUDIT_ARCH_PPC64; |
94 | #ifdef __LITTLE_ENDIAN__ | ||
95 | arch |= __AUDIT_ARCH_LE; | ||
96 | #endif | ||
97 | return arch; | ||
94 | } | 98 | } |
95 | #endif /* _ASM_SYSCALL_H */ | 99 | #endif /* _ASM_SYSCALL_H */ |
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index d4dbef14d4df..584bb0113e25 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h | |||
@@ -365,7 +365,9 @@ enum { | |||
365 | #define AUDIT_ARCH_PARISC (EM_PARISC) | 365 | #define AUDIT_ARCH_PARISC (EM_PARISC) |
366 | #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) | 366 | #define AUDIT_ARCH_PARISC64 (EM_PARISC|__AUDIT_ARCH_64BIT) |
367 | #define AUDIT_ARCH_PPC (EM_PPC) | 367 | #define AUDIT_ARCH_PPC (EM_PPC) |
368 | /* do not define AUDIT_ARCH_PPCLE since it is not supported by audit */ | ||
368 | #define AUDIT_ARCH_PPC64 (EM_PPC64|__AUDIT_ARCH_64BIT) | 369 | #define AUDIT_ARCH_PPC64 (EM_PPC64|__AUDIT_ARCH_64BIT) |
370 | #define AUDIT_ARCH_PPC64LE (EM_PPC64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) | ||
369 | #define AUDIT_ARCH_S390 (EM_S390) | 371 | #define AUDIT_ARCH_S390 (EM_S390) |
370 | #define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT) | 372 | #define AUDIT_ARCH_S390X (EM_S390|__AUDIT_ARCH_64BIT) |
371 | #define AUDIT_ARCH_SH (EM_SH) | 373 | #define AUDIT_ARCH_SH (EM_SH) |