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>

diff --git a/MAINTAINERS b/MAINTAINERS
index eeb4c70b3d5b50a8e32b7ffe4e5e6cf253bbba68..94c88bc0502f6a9f9173b61fc19857a383367d41 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3113,6 +3113,7 @@ W:        https://github.com/linux-audit
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git
 F:     include/asm-generic/audit_*.h
 F:     include/linux/audit.h
+F:     include/linux/audit_arch.h
 F:     include/uapi/linux/audit.h
 F:     kernel/audit*
 F:     lib/*audit.c

diff --git a/arch/alpha/kernel/audit.c b/arch/alpha/kernel/audit.c
index 96a9d18ff4c4c87c0c469b9d3ecd7cbd3c6963ca..81cbd804e37556c0978e39e7742a47ac9bad9c51 100644 (file)
--- a/arch/alpha/kernel/audit.c
+++ b/arch/alpha/kernel/audit.c
@@ -37,13 +37,13 @@ int audit_classify_syscall(int abi, unsigned syscall)
 {
        switch(syscall) {
        case __NR_open:
-               return 2;
+               return AUDITSC_OPEN;
        case __NR_openat:
-               return 3;
+               return AUDITSC_OPENAT;
        case __NR_execve:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 0;
+               return AUDITSC_NATIVE;
        }
 }
 

diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c
index 5192ca899fe608be2345b48dcdc30292d9447569..dba6a74c9ab3a253dfa1eafed8be3e99ec19c58c 100644 (file)
--- a/arch/ia64/kernel/audit.c
+++ b/arch/ia64/kernel/audit.c
@@ -38,13 +38,13 @@ int audit_classify_syscall(int abi, unsigned syscall)
 {
        switch(syscall) {
        case __NR_open:
-               return 2;
+               return AUDITSC_OPEN;
        case __NR_openat:
-               return 3;
+               return AUDITSC_OPENAT;
        case __NR_execve:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 0;
+               return AUDITSC_NATIVE;
        }
 }
 

diff --git a/arch/parisc/kernel/audit.c b/arch/parisc/kernel/audit.c
index 9eb47b2225d2d8cf26377702ea3a9b327fb630ae..14244e83db75130fb80c56666b6c12423013a032 100644 (file)
--- a/arch/parisc/kernel/audit.c
+++ b/arch/parisc/kernel/audit.c
@@ -47,13 +47,13 @@ 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:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 0;
+               return AUDITSC_NATIVE;
        }
 }
 

diff --git a/arch/parisc/kernel/compat_audit.c b/arch/parisc/kernel/compat_audit.c
index 20c39c9d86a9aedb3c15739f6c5108987c0d47d3..1991b99f92ba0f760cdd8e23483239fc2561d4bd 100644 (file)
--- a/arch/parisc/kernel/compat_audit.c
+++ b/arch/parisc/kernel/compat_audit.c
@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
+#include <linux/audit_arch.h>
 #include <asm/unistd.h>
 
 unsigned int parisc32_dir_class[] = {
@@ -30,12 +31,12 @@ int parisc32_classify_syscall(unsigned syscall)
 {
        switch (syscall) {
        case __NR_open:
-               return 2;
+               return AUDITSC_OPEN;
        case __NR_openat:
-               return 3;
+               return AUDITSC_OPENAT;
        case __NR_execve:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 1;
+               return AUDITSC_COMPAT;
        }
 }

diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c
index a2dddd7f3d09a514fa0978f7f4721e944bca1307..6eb18ef77dffbf078ace0c1159a3c183ce523bdd 100644 (file)
--- a/arch/powerpc/kernel/audit.c
+++ b/arch/powerpc/kernel/audit.c
@@ -47,15 +47,15 @@ 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_socketcall:
-               return 4;
+               return AUDITSC_SOCKETCALL;
        case __NR_execve:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 0;
+               return AUDITSC_NATIVE;
        }
 }
 

diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c
index 55c6ccda0a85daa9ce41f2b2aeb063a6c998ee73..216a54f85a1262ca4078eadab22c1b2b70e8b6fd 100644 (file)
--- a/arch/powerpc/kernel/compat_audit.c
+++ b/arch/powerpc/kernel/compat_audit.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #undef __powerpc64__
+#include <linux/audit_arch.h>
 #include <asm/unistd.h>
 
 unsigned ppc32_dir_class[] = {
@@ -31,14 +32,14 @@ int ppc32_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:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 1;
+               return AUDITSC_COMPAT;
        }
 }

diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c
index d395c6c9944cf17433aa71f0b3c5fd0747d2e741..7e331e1831d44b58e3422b3242e9f43c5509fd97 100644 (file)
--- a/arch/s390/kernel/audit.c
+++ b/arch/s390/kernel/audit.c
@@ -47,15 +47,15 @@ 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_socketcall:
-               return 4;
+               return AUDITSC_SOCKETCALL;
        case __NR_execve:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 0;
+               return AUDITSC_NATIVE;
        }
 }
 

diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c
index 444fb1f6694472570b515a330c9f3147ace8d2b5..acacc96c57cbe68acfcf3ebc7de28e7d0119c530 100644 (file)
--- a/arch/s390/kernel/compat_audit.c
+++ b/arch/s390/kernel/compat_audit.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #undef __s390x__
+#include <linux/audit_arch.h>
 #include <asm/unistd.h>
 #include "audit.h"
 
@@ -32,14 +33,14 @@ int s390_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:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 1;
+               return AUDITSC_COMPAT;
        }
 }

diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c
index a6e91bf34d48ff4107bd3c567192122ef480a5b4..50fab35bdaba4d36d96d72694bc7fa027cc346cd 100644 (file)
--- a/arch/sparc/kernel/audit.c
+++ b/arch/sparc/kernel/audit.c
@@ -48,15 +48,15 @@ int audit_classify_syscall(int abi, unsigned int syscall)
 #endif
        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:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 0;
+               return AUDITSC_NATIVE;
        }
 }
 

diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c
index 10eeb4f15b206639d735738e5791df809c345e7d..12515bd655c3cae550601ed962a6067225bd9221 100644 (file)
--- a/arch/sparc/kernel/compat_audit.c
+++ b/arch/sparc/kernel/compat_audit.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #define __32bit_syscall_numbers__
+#include <linux/audit_arch.h>
 #include <asm/unistd.h>
 #include "kernel.h"
 
@@ -32,14 +33,14 @@ int sparc32_classify_syscall(unsigned int 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:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 1;
+               return AUDITSC_COMPAT;
        }
 }

diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c
index 6efe6cb3768ae8c3040daf34325867ec15a58a87..a5fc3b1385e03228607b2e60c872818eb2f50c5a 100644 (file)
--- 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 83d9cad4e68bd33e06dd61d0db49319cd11ece79..2a6cc9c9c8812bcebaa09a11246d5aab2dbcb475 100644 (file)
--- 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;
        }
 }
 

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 82b7c1116a85c42cb9fb8665122b931ac9cafc7d..5fbeeeb6b7263dd607a75625017fb8602e88a2c4 100644 (file)
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -11,6 +11,7 @@
 
 #include <linux/sched.h>
 #include <linux/ptrace.h>
+#include <linux/audit_arch.h>
 #include <uapi/linux/audit.h>
 #include <uapi/linux/netfilter/nf_tables.h>
 

diff --git a/include/linux/audit_arch.h b/include/linux/audit_arch.h
new file mode 100644 (file)
index 0000000..d4a506f
--- /dev/null
+++ b/include/linux/audit_arch.h
@@ -0,0 +1,23 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* audit_arch.h -- Arch layer specific support for audit
+ *
+ * Copyright 2021 Red Hat Inc., Durham, North Carolina.
+ * All Rights Reserved.
+ *
+ * Author: Richard Guy Briggs <rgb@redhat.com>
+ */
+#ifndef _LINUX_AUDIT_ARCH_H_
+#define _LINUX_AUDIT_ARCH_H_
+
+enum auditsc_class_t {
+       AUDITSC_NATIVE = 0,
+       AUDITSC_COMPAT,
+       AUDITSC_OPEN,
+       AUDITSC_OPENAT,
+       AUDITSC_SOCKETCALL,
+       AUDITSC_EXECVE,
+
+       AUDITSC_NVALS /* count */
+};
+
+#endif

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 1af4e7d0c16ed5d7d2d2246f9b013c24313504d6..3f9108101598d4cb16b268b202296bb1a6f25c1a 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -153,7 +153,7 @@ static int audit_match_perm(struct audit_context *ctx, int mask)
        n = ctx->major;
 
        switch (audit_classify_syscall(ctx->arch, n)) {
-       case 0: /* native */
+       case AUDITSC_NATIVE:
                if ((mask & AUDIT_PERM_WRITE) &&
                     audit_match_class(AUDIT_CLASS_WRITE, n))
                        return 1;
@@ -164,7 +164,7 @@ static int audit_match_perm(struct audit_context *ctx, int mask)
                     audit_match_class(AUDIT_CLASS_CHATTR, n))
                        return 1;
                return 0;
-       case 1: /* 32bit on biarch */
+       case AUDITSC_COMPAT: /* 32bit on biarch */
                if ((mask & AUDIT_PERM_WRITE) &&
                     audit_match_class(AUDIT_CLASS_WRITE_32, n))
                        return 1;
@@ -175,13 +175,13 @@ static int audit_match_perm(struct audit_context *ctx, int mask)
                     audit_match_class(AUDIT_CLASS_CHATTR_32, n))
                        return 1;
                return 0;
-       case 2: /* open */
+       case AUDITSC_OPEN:
                return mask & ACC_MODE(ctx->argv[1]);
-       case 3: /* openat */
+       case AUDITSC_OPENAT:
                return mask & ACC_MODE(ctx->argv[2]);
-       case 4: /* socketcall */
+       case AUDITSC_SOCKETCALL:
                return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND);
-       case 5: /* execve */
+       case AUDITSC_EXECVE:
                return mask & AUDIT_PERM_EXEC;
        default:
                return 0;

diff --git a/lib/audit.c b/lib/audit.c
index 5004bff928a70e74077381a7245d2e86141e688f..3ec1a94d8d64b4c5a28d686d11b78e568ad817e2 100644 (file)
--- a/lib/audit.c
+++ b/lib/audit.c
@@ -45,23 +45,23 @@ int audit_classify_syscall(int abi, unsigned syscall)
        switch(syscall) {
 #ifdef __NR_open
        case __NR_open:
-               return 2;
+               return AUDITSC_OPEN;
 #endif
 #ifdef __NR_openat
        case __NR_openat:
-               return 3;
+               return AUDITSC_OPENAT;
 #endif
 #ifdef __NR_socketcall
        case __NR_socketcall:
-               return 4;
+               return AUDITSC_SOCKETCALL;
 #endif
 #ifdef __NR_execveat
        case __NR_execveat:
 #endif
        case __NR_execve:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 0;
+               return AUDITSC_NATIVE;
        }
 }
 

diff --git a/lib/compat_audit.c b/lib/compat_audit.c
index 77eabad69b4a8fcde3edc3d869548a67bbeff383..d6567d9e8b999179e4ebd29319b1ecd81afa47f0 100644 (file)
--- a/lib/compat_audit.c
+++ b/lib/compat_audit.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <linux/init.h>
 #include <linux/types.h>
+#include <linux/audit_arch.h>
 #include <asm/unistd32.h>
 
 unsigned compat_dir_class[] = {
@@ -33,19 +34,19 @@ int audit_classify_compat_syscall(int abi, unsigned syscall)
        switch (syscall) {
 #ifdef __NR_open
        case __NR_open:
-               return 2;
+               return AUDITSC_OPEN;
 #endif
 #ifdef __NR_openat
        case __NR_openat:
-               return 3;
+               return AUDITSC_OPENAT;
 #endif
 #ifdef __NR_socketcall
        case __NR_socketcall:
-               return 4;
+               return AUDITSC_SOCKETCALL;
 #endif
        case __NR_execve:
-               return 5;
+               return AUDITSC_EXECVE;
        default:
-               return 1;
+               return AUDITSC_COMPAT;
        }
 }