diff options
| author |   Richard Guy Briggs <rgb@redhat.com> | 2021-05-19 16:00:20 -0400 |
|---|---|---|
| committer |   Paul Moore <paul@paul-moore.com> | 2021-10-01 16:41:33 -0400 |
| commit | 42f355ef59a2f98fa4affb4265d3ba3e2d86baf1 (patch) | |
| tree | 5dbd56c92446d17c1536d4d244979d9a15334a2c /arch/x86 | |
| parent | lsm_audit: avoid overloading the "key" audit field (diff) | |
| download | linux-dev-42f355ef59a2f98fa4affb4265d3ba3e2d86baf1.tar.xz linux-dev-42f355ef59a2f98fa4affb4265d3ba3e2d86baf1.zip | |
audit: replace magic audit syscall class numbers with macros
Replace audit syscall class magic numbers with macros.
This required putting the macros into new header file
include/linux/audit_arch.h since the syscall macros were
included for both 64 bit and 32 bit in any compat code, causing
redefinition warnings.
Link: https://lore.kernel.org/r/2300b1083a32aade7ae7efb95826e8f3f260b1df.1621363275.git.rgb@redhat.com
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
[PM: renamed header to audit_arch.h after consulting with Richard]
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/ia32/audit.c | 11 | ||||
| -rw-r--r-- | arch/x86/kernel/audit_64.c | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c index 6efe6cb3768a..a5fc3b1385e0 100644 --- a/arch/x86/ia32/audit.c +++ b/arch/x86/ia32/audit.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#include <linux/audit_arch.h> #include <asm/unistd_32.h> #include <asm/audit.h> @@ -31,15 +32,15 @@ int ia32_classify_syscall(unsigned syscall) { switch (syscall) { case __NR_open: - return 2; + return AUDITSC_OPEN; case __NR_openat: - return 3; + return AUDITSC_OPENAT; case __NR_socketcall: - return 4; + return AUDITSC_SOCKETCALL; case __NR_execve: case __NR_execveat: - return 5; + return AUDITSC_EXECVE; default: - return 1; + return AUDITSC_COMPAT; } } diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c index 83d9cad4e68b..2a6cc9c9c881 100644 --- a/arch/x86/kernel/audit_64.c +++ b/arch/x86/kernel/audit_64.c @@ -47,14 +47,14 @@ int audit_classify_syscall(int abi, unsigned syscall) #endif switch(syscall) { case __NR_open: - return 2; + return AUDITSC_OPEN; case __NR_openat: - return 3; + return AUDITSC_OPENAT; case __NR_execve: case __NR_execveat: - return 5; + return AUDITSC_EXECVE; default: - return 0; + return AUDITSC_NATIVE; } } |