audit: add support for the openat2 syscall

The openat2(2) syscall was added in kernel v5.6 with commit
fddb5d430ad9 ("open: introduce openat2(2) syscall").

Add the openat2(2) syscall to the audit syscall classifier.

Link: https://github.com/linux-audit/audit-kernel/issues/67
Link: https://lore.kernel.org/r/f5f1a4d8699613f8c02ce762807228c841c2e26f.1621363275.git.rgb@redhat.com
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
[PM: merge fuzz due to previous header rename, commit line wraps]
Signed-off-by: Paul Moore <paul@paul-moore.com>

diff --git a/arch/alpha/kernel/audit.c b/arch/alpha/kernel/audit.c
index 81cbd80..3ab0470 100644 (file)
--- a/arch/alpha/kernel/audit.c
+++ b/arch/alpha/kernel/audit.c
@@ -42,6 +42,8 @@ int audit_classify_syscall(int abi, unsigned syscall)
                return AUDITSC_OPENAT;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_NATIVE;
        }

diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c
index dba6a74..ec61f20 100644 (file)
--- a/arch/ia64/kernel/audit.c
+++ b/arch/ia64/kernel/audit.c
@@ -43,6 +43,8 @@ int audit_classify_syscall(int abi, unsigned syscall)
                return AUDITSC_OPENAT;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_NATIVE;
        }

diff --git a/arch/parisc/kernel/audit.c b/arch/parisc/kernel/audit.c
index 14244e8..f420b55 100644 (file)
--- a/arch/parisc/kernel/audit.c
+++ b/arch/parisc/kernel/audit.c
@@ -52,6 +52,8 @@ int audit_classify_syscall(int abi, unsigned syscall)
                return AUDITSC_OPENAT;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_NATIVE;
        }

diff --git a/arch/parisc/kernel/compat_audit.c b/arch/parisc/kernel/compat_audit.c
index 1991b99..539b168 100644 (file)
--- a/arch/parisc/kernel/compat_audit.c
+++ b/arch/parisc/kernel/compat_audit.c
@@ -36,6 +36,8 @@ int parisc32_classify_syscall(unsigned syscall)
                return AUDITSC_OPENAT;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_COMPAT;
        }

diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c
index 6eb18ef..1bcfca5 100644 (file)
--- a/arch/powerpc/kernel/audit.c
+++ b/arch/powerpc/kernel/audit.c
@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)
                return AUDITSC_SOCKETCALL;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_NATIVE;
        }

diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c
index 216a54f..d92ffe4 100644 (file)
--- a/arch/powerpc/kernel/compat_audit.c
+++ b/arch/powerpc/kernel/compat_audit.c
@@ -39,6 +39,8 @@ int ppc32_classify_syscall(unsigned syscall)
                return AUDITSC_SOCKETCALL;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_COMPAT;
        }

diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c
index 7e331e1..02051a5 100644 (file)
--- a/arch/s390/kernel/audit.c
+++ b/arch/s390/kernel/audit.c
@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)
                return AUDITSC_SOCKETCALL;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_NATIVE;
        }

diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c
index acacc96..a7c46e8 100644 (file)
--- a/arch/s390/kernel/compat_audit.c
+++ b/arch/s390/kernel/compat_audit.c
@@ -40,6 +40,8 @@ int s390_classify_syscall(unsigned syscall)
                return AUDITSC_SOCKETCALL;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_COMPAT;
        }

diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c
index 50fab35..b092274 100644 (file)
--- a/arch/sparc/kernel/audit.c
+++ b/arch/sparc/kernel/audit.c
@@ -55,6 +55,8 @@ int audit_classify_syscall(int abi, unsigned int syscall)
                return AUDITSC_SOCKETCALL;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_NATIVE;
        }

diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c
index 12515bd..f1ea000 100644 (file)
--- a/arch/sparc/kernel/compat_audit.c
+++ b/arch/sparc/kernel/compat_audit.c
@@ -40,6 +40,8 @@ int sparc32_classify_syscall(unsigned int syscall)
                return AUDITSC_SOCKETCALL;
        case __NR_execve:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_COMPAT;
        }

diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c
index a5fc3b1..59e1954 100644 (file)
--- a/arch/x86/ia32/audit.c
+++ b/arch/x86/ia32/audit.c
@@ -40,6 +40,8 @@ int ia32_classify_syscall(unsigned syscall)
        case __NR_execve:
        case __NR_execveat:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_COMPAT;
        }

diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c
index 2a6cc9c..44c3601 100644 (file)
--- a/arch/x86/kernel/audit_64.c
+++ b/arch/x86/kernel/audit_64.c
@@ -53,6 +53,8 @@ int audit_classify_syscall(int abi, unsigned syscall)
        case __NR_execve:
        case __NR_execveat:
                return AUDITSC_EXECVE;
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
        default:
                return AUDITSC_NATIVE;
        }

diff --git a/include/linux/audit_arch.h b/include/linux/audit_arch.h
index d4a506f..8fdb1af 100644 (file)
--- a/include/linux/audit_arch.h
+++ b/include/linux/audit_arch.h
@@ -16,6 +16,7 @@ enum auditsc_class_t {
        AUDITSC_OPENAT,
        AUDITSC_SOCKETCALL,
        AUDITSC_EXECVE,
+       AUDITSC_OPENAT2,
 
        AUDITSC_NVALS /* count */
 };

diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index 3f91081..8c4335a 100644 (file)
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -63,6 +63,7 @@
 #include <linux/fsnotify_backend.h>
 #include <uapi/linux/limits.h>
 #include <uapi/linux/netfilter/nf_tables.h>
+#include <uapi/linux/openat2.h>
 
 #include "audit.h"
 
@@ -183,6 +184,8 @@ static int audit_match_perm(struct audit_context *ctx, int mask)
                return ((mask & AUDIT_PERM_WRITE) && ctx->argv[0] == SYS_BIND);
        case AUDITSC_EXECVE:
                return mask & AUDIT_PERM_EXEC;
+       case AUDITSC_OPENAT2:
+               return mask & ACC_MODE((u32)((struct open_how *)ctx->argv[2])->flags);
        default:
                return 0;
        }

diff --git a/lib/audit.c b/lib/audit.c
index 3ec1a94..738bda2 100644 (file)
--- a/lib/audit.c
+++ b/lib/audit.c
@@ -60,6 +60,10 @@ int audit_classify_syscall(int abi, unsigned syscall)
 #endif
        case __NR_execve:
                return AUDITSC_EXECVE;
+#ifdef __NR_openat2
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
+#endif
        default:
                return AUDITSC_NATIVE;
        }

diff --git a/lib/compat_audit.c b/lib/compat_audit.c
index d6567d9..3d6b899 100644 (file)
--- a/lib/compat_audit.c
+++ b/lib/compat_audit.c
@@ -46,6 +46,10 @@ int audit_classify_compat_syscall(int abi, unsigned syscall)
 #endif
        case __NR_execve:
                return AUDITSC_EXECVE;
+#ifdef __NR_openat2
+       case __NR_openat2:
+               return AUDITSC_OPENAT2;
+#endif
        default:
                return AUDITSC_COMPAT;
        }