| Message ID | 1389946399-4525-2-git-send-email-takahiro.akashi@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, Jan 17, 2014 at 08:13:14AM +0000, AKASHI Takahiro wrote: > --- a/include/uapi/linux/audit.h > +++ b/include/uapi/linux/audit.h > @@ -327,6 +327,8 @@ enum { > /* distinguish syscall tables */ > #define __AUDIT_ARCH_64BIT 0x80000000 > #define __AUDIT_ARCH_LE 0x40000000 > +#define AUDIT_ARCH_AARCH64 (EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) > +#define AUDIT_ARCH_AARCH64EB (EM_AARCH64|__AUDIT_ARCH_64BIT) > #define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) > #define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE) > #define AUDIT_ARCH_ARMEB (EM_ARM) > diff --git a/init/Kconfig b/init/Kconfig > index 79383d3..3aae602 100644 > --- a/init/Kconfig > +++ b/init/Kconfig > @@ -284,7 +284,7 @@ config AUDIT > > config AUDITSYSCALL > bool "Enable system-call auditing support" > - depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT)) > + depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT) || ARM64) The usual comment for such changes: could you please clean this up and just use something like "depends on HAVE_ARCH_AUDITSYSCALL"?
[To audit maintainers] On 01/23/2014 11:18 PM, Catalin Marinas wrote: > On Fri, Jan 17, 2014 at 08:13:14AM +0000, AKASHI Takahiro wrote: >> --- a/include/uapi/linux/audit.h >> +++ b/include/uapi/linux/audit.h >> @@ -327,6 +327,8 @@ enum { >> /* distinguish syscall tables */ >> #define __AUDIT_ARCH_64BIT 0x80000000 >> #define __AUDIT_ARCH_LE 0x40000000 >> +#define AUDIT_ARCH_AARCH64 (EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) >> +#define AUDIT_ARCH_AARCH64EB (EM_AARCH64|__AUDIT_ARCH_64BIT) >> #define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) >> #define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE) >> #define AUDIT_ARCH_ARMEB (EM_ARM) >> diff --git a/init/Kconfig b/init/Kconfig >> index 79383d3..3aae602 100644 >> --- a/init/Kconfig >> +++ b/init/Kconfig >> @@ -284,7 +284,7 @@ config AUDIT >> >> config AUDITSYSCALL >> bool "Enable system-call auditing support" >> - depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT)) >> + depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT) || ARM64) > > The usual comment for such changes: could you please clean this up and > just use something like "depends on HAVE_ARCH_AUDITSYSCALL"? Do you agree to this change? If so, I can create a patch, but have some concerns: 1) I can't verify it on other architectures than (arm &) arm64. 2) Some architectures (microblaze, mips, openrisc) are not listed here, but their ptrace.c have a call to audit_syscall_entry/exit(). (audit_syscall_entry/exit are null if !AUDITSYSCALL, though) So I'm afraid that the change might break someone's assumption. Thanks, -Takahiro AKASHI
On Mon, Jan 27, 2014 at 05:12:33AM +0000, AKASHI Takahiro wrote: > [To audit maintainers] > > On 01/23/2014 11:18 PM, Catalin Marinas wrote: > > On Fri, Jan 17, 2014 at 08:13:14AM +0000, AKASHI Takahiro wrote: > >> --- a/include/uapi/linux/audit.h > >> +++ b/include/uapi/linux/audit.h > >> @@ -327,6 +327,8 @@ enum { > >> /* distinguish syscall tables */ > >> #define __AUDIT_ARCH_64BIT 0x80000000 > >> #define __AUDIT_ARCH_LE 0x40000000 > >> +#define AUDIT_ARCH_AARCH64 (EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) > >> +#define AUDIT_ARCH_AARCH64EB (EM_AARCH64|__AUDIT_ARCH_64BIT) > >> #define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) > >> #define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE) > >> #define AUDIT_ARCH_ARMEB (EM_ARM) > >> diff --git a/init/Kconfig b/init/Kconfig > >> index 79383d3..3aae602 100644 > >> --- a/init/Kconfig > >> +++ b/init/Kconfig > >> @@ -284,7 +284,7 @@ config AUDIT > >> > >> config AUDITSYSCALL > >> bool "Enable system-call auditing support" > >> - depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT)) > >> + depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT) || ARM64) > > > > The usual comment for such changes: could you please clean this up and > > just use something like "depends on HAVE_ARCH_AUDITSYSCALL"? > > Do you agree to this change? > > If so, I can create a patch, but have some concerns: > 1) I can't verify it on other architectures than (arm &) arm64. You could try to build. It's really a trivial change, could get away with code inspection (and some automatic building when it gets to linux-next). In init/Kconfig: config HAVE_ARCH_AUDITSYSCALL bool and: - depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT)) + depends on HAVE_ARCH_AUDITSYSCALL In the corresponding arch/*/Kconfig: select HAVE_ARCH_AUDITSYSCALL > 2) Some architectures (microblaze, mips, openrisc) are not listed here, but For those, you don't need to select HAVE_ARCH_AUDITSYSCALL. > their ptrace.c have a call to audit_syscall_entry/exit(). > (audit_syscall_entry/exit are null if !AUDITSYSCALL, though) They are not NULL but empty inline functions, so they don't have any effect. > So I'm afraid that the change might break someone's assumption. I'm pretty sure it won't ;).
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index 44b05a0..e39635b 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h @@ -327,6 +327,8 @@ enum { /* distinguish syscall tables */ #define __AUDIT_ARCH_64BIT 0x80000000 #define __AUDIT_ARCH_LE 0x40000000 +#define AUDIT_ARCH_AARCH64 (EM_AARCH64|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) +#define AUDIT_ARCH_AARCH64EB (EM_AARCH64|__AUDIT_ARCH_64BIT) #define AUDIT_ARCH_ALPHA (EM_ALPHA|__AUDIT_ARCH_64BIT|__AUDIT_ARCH_LE) #define AUDIT_ARCH_ARM (EM_ARM|__AUDIT_ARCH_LE) #define AUDIT_ARCH_ARMEB (EM_ARM) diff --git a/init/Kconfig b/init/Kconfig index 79383d3..3aae602 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -284,7 +284,7 @@ config AUDIT config AUDITSYSCALL bool "Enable system-call auditing support" - depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT)) + depends on AUDIT && (X86 || PARISC || PPC || S390 || IA64 || UML || SPARC64 || SUPERH || (ARM && AEABI && !OABI_COMPAT) || ARM64) default y if SECURITY_SELINUX help Enable low-overhead system-call auditing infrastructure that
This patch adds AUDIT_ARCH_* identifiers for arm64(AArch64), and makes CONFIG_AUDITSYSCALL selectable. Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> --- include/uapi/linux/audit.h | 2 ++ init/Kconfig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)