audit: add support for openat2
Subsystems (9)
v3 cover audit: add support for openat2
The openat2(2) syscall was added in v5.6. Add support for openat2 to the audit syscall classifier and for recording openat2 parameters that cannot be captured in the syscall parameters of the SYSCALL record.
Supporting userspace code can be found in
https://github.com/rgbriggs/audit-userspace/tree/ghau-openat2
Supporting test case can be found in
https://github.com/linux-audit/audit-testsuite/pull/103
Changelog:
v3:
- re-add commit descriptions that somehow got dropped
- add new file to MAINTAINERS
v2:
- add include/linux/auditscm.h for audit syscall class macros due to syscall redefinition warnings:
arch/x86/ia32/audit.c:3:
./include/linux/audit.h:12,
./include/linux/sched.h:22,
./include/linux/seccomp.h:21,
./arch/x86/include/asm/seccomp.h:5,
./arch/x86/include/asm/unistd.h:20,
./arch/x86/include/generated/uapi/asm/unistd_64.h:4: warning: "__NR_read" redefined #define __NR_read 0
...
./arch/x86/include/generated/uapi/asm/unistd_64.h:338: warning: "__NR_rseq" redefined #define __NR_rseq 334
previous:
arch/x86/ia32/audit.c:2:
./arch/x86/include/generated/uapi/asm/unistd_32.h:7: note: this is the location of the previous definition #define __NR_read 3
...
./arch/x86/include/generated/uapi/asm/unistd_32.h:386: note: this is the location of the previous definition #define __NR_rseq 386Richard Guy Briggs (3):
audit: replace magic audit syscall class numbers with macros
audit: add support for the openat2 syscall
audit: add OPENAT2 record to list how
MAINTAINERS | 1 + arch/alpha/kernel/audit.c | 10 ++++++---- arch/ia64/kernel/audit.c | 10 ++++++---- arch/parisc/kernel/audit.c | 10 ++++++---- arch/parisc/kernel/compat_audit.c | 11 +++++++---- arch/powerpc/kernel/audit.c | 12 +++++++----- arch/powerpc/kernel/compat_audit.c | 13 ++++++++----- arch/s390/kernel/audit.c | 12 +++++++----- arch/s390/kernel/compat_audit.c | 13 ++++++++----- arch/sparc/kernel/audit.c | 12 +++++++----- arch/sparc/kernel/compat_audit.c | 13 ++++++++----- arch/x86/ia32/audit.c | 13 ++++++++----- arch/x86/kernel/audit_64.c | 10 ++++++---- fs/open.c | 2 ++ include/linux/audit.h | 11 +++++++++++ include/linux/auditscm.h | 24 +++++++++++++++++++++++ include/uapi/linux/audit.h | 1 + kernel/audit.h | 2 ++ kernel/auditsc.c | 31 ++++++++++++++++++++++++------ lib/audit.c | 14 +++++++++----- lib/compat_audit.c | 15 ++++++++++----- 21 files changed, 169 insertions(+), 71 deletions(-) create mode 100644 include/linux/auditscm.h
Signature · 1 line
2.27.0
PATCH v3 1/3 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/auditscm.h since the syscall macros were included for both 64 bit and 32 bit in any compat code, causing redefinition warnings.
--- MAINTAINERS | 1 + arch/alpha/kernel/audit.c | 8 ++++---- arch/ia64/kernel/audit.c | 8 ++++---- arch/parisc/kernel/audit.c | 8 ++++---- arch/parisc/kernel/compat_audit.c | 9 +++++---- arch/powerpc/kernel/audit.c | 10 +++++----- arch/powerpc/kernel/compat_audit.c | 11 ++++++----- arch/s390/kernel/audit.c | 10 +++++----- arch/s390/kernel/compat_audit.c | 11 ++++++----- arch/sparc/kernel/audit.c | 10 +++++----- arch/sparc/kernel/compat_audit.c | 11 ++++++----- arch/x86/ia32/audit.c | 11 ++++++----- arch/x86/kernel/audit_64.c | 8 ++++---- include/linux/audit.h | 1 + include/linux/auditscm.h | 23 +++++++++++++++++++++++ kernel/auditsc.c | 12 ++++++------ lib/audit.c | 10 +++++----- lib/compat_audit.c | 11 ++++++----- 18 files changed, 102 insertions(+), 71 deletions(-) create mode 100644 include/linux/auditscm.h
MAINTAINERS +1 -0
@@ -2981,6 +2981,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/auditscm.h F: include/uapi/linux/audit.h F: kernel/audit* F: lib/*audit.c
arch/alpha/kernel/audit.c +4 -4
@@ -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 ; } }
arch/ia64/kernel/audit.c +4 -4
@@ -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 ; } }
arch/parisc/kernel/audit.c +4 -4
@@ -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 ; } }
arch/parisc/kernel/compat_audit.c +5 -4
@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#include <linux/auditscm.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 ; } }
arch/powerpc/kernel/audit.c +5 -5
@@ -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 ; } }
arch/powerpc/kernel/compat_audit.c +6 -5
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #undef __powerpc64__ +#include <linux/auditscm.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 ; } }
arch/s390/kernel/audit.c +5 -5
@@ -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 ; } }
arch/s390/kernel/compat_audit.c +6 -5
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #undef __s390x__ +#include <linux/auditscm.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 ; } }
arch/sparc/kernel/audit.c +5 -5
@@ -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 ; } }
arch/sparc/kernel/compat_audit.c +6 -5
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0 #define __32bit_syscall_numbers__ +#include <linux/auditscm.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 ; } }
arch/x86/ia32/audit.c +6 -5
@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#include <linux/auditscm.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 ; } }
arch/x86/kernel/audit_64.c +4 -4
@@ -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 ; } }
include/linux/audit.h +1 -0
@@ -11,6 +11,7 @@#include <linux/sched.h> #include <linux/ptrace.h> +#include <linux/auditscm.h> /* syscall class macros */ #include <uapi/linux/audit.h> #include <uapi/linux/netfilter/nf_tables.h>
include/linux/auditscm.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* auditscm.h -- Auditing support syscall macros +* +* Copyright 2021 Red Hat Inc., Durham, North Carolina. +* All Rights Reserved. +* +* Author: Richard Guy Briggs <[email protected]> +*/ +#ifndef _LINUX_AUDITSCM_H_ +#define _LINUX_AUDITSCM_H_ + +enum auditsc_class_t { +AUDITSC_NATIVE =0 , +AUDITSC_COMPAT , +AUDITSC_OPEN , +AUDITSC_OPENAT , +AUDITSC_SOCKETCALL , +AUDITSC_EXECVE , + +AUDITSC_NVALS /* count */ +}; + +#endif
kernel/auditsc.c +6 -6
@@ -165,7 +165,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 ;
@@ -176,7 +176,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 ;
@@ -187,13 +187,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 ;
lib/audit.c +5 -5
@@ -45,23 +45,23 @@ int audit_classify_syscall(int abi, unsigned syscall)switch (syscall) {#ifdef __NR_opencase __NR_open: -return 2 ; +return AUDITSC_OPEN ;#endif #ifdef __NR_openatcase __NR_openat: -return 3 ; +return AUDITSC_OPENAT ;#endif #ifdef __NR_socketcallcase __NR_socketcall: -return 4 ; +return AUDITSC_SOCKETCALL ;#endif #ifdef __NR_execveatcase __NR_execveat:#endif case __NR_execve: -return 5 ; +return AUDITSC_EXECVE ;default : -return 0 ; +return AUDITSC_NATIVE ; } }
lib/compat_audit.c +6 -5
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/init.h> #include <linux/types.h> +#include <linux/auditscm.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_opencase __NR_open: -return 2 ; +return AUDITSC_OPEN ;#endif #ifdef __NR_openatcase __NR_openat: -return 3 ; +return AUDITSC_OPENAT ;#endif #ifdef __NR_socketcallcase __NR_socketcall: -return 4 ; +return AUDITSC_SOCKETCALL ;#endif case __NR_execve: -return 5 ; +return AUDITSC_EXECVE ;default : -return 1 ; +return AUDITSC_COMPAT ; } }
Signature · 1 line
2.27.0
Paul Moore
maintainerRe: [PATCH v3 1/3] audit: replace magic audit syscall class numbers with macros
Quoted 6 lines · Richard Guy Briggs
Replace audit syscall class magic numbers with macros.
This required putting the macros into new header file
include/linux/auditscm.hsince the syscall macros were included for both 64 bit and 32 bit in any compat code, causing redefinition warnings.
The ifndef/define didn't protect against redeclaration? Huh. Maybe I'm not thinking about this correctly, or the arch specific code is doing something wonky ...
Regardless, assuming that it is necessary, I would prefer if we called it auditsc.h instead of auditscm.h; the latter makes me think of sockets and not syscalls.
Quoted 22 lines
Signed-off-by Richard Guy Briggs <[email protected]>--- MAINTAINERS | 1 + arch/alpha/kernel/audit.c | 8 ++++---- arch/ia64/kernel/audit.c | 8 ++++---- arch/parisc/kernel/audit.c | 8 ++++---- arch/parisc/kernel/compat_audit.c | 9 +++++---- arch/powerpc/kernel/audit.c | 10 +++++----- arch/powerpc/kernel/compat_audit.c | 11 ++++++----- arch/s390/kernel/audit.c | 10 +++++----- arch/s390/kernel/compat_audit.c | 11 ++++++----- arch/sparc/kernel/audit.c | 10 +++++----- arch/sparc/kernel/compat_audit.c | 11 ++++++----- arch/x86/ia32/audit.c | 11 ++++++----- arch/x86/kernel/audit_64.c | 8 ++++---- include/linux/audit.h | 1 + include/linux/auditscm.h | 23 +++++++++++++++++++++++ kernel/auditsc.c | 12 ++++++------ lib/audit.c | 10 +++++----- lib/compat_audit.c | 11 ++++++----- 18 files changed, 102 insertions(+), 71 deletions(-) create mode 100644 include/linux/auditscm.h
...
Quoted 29 lines
include/linux/auditscm.h new file +23
-0@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* auditscm.h -- Auditing support syscall macros +* +* Copyright 2021 Red Hat Inc., Durham, North Carolina. +* All Rights Reserved. +* +* Author: Richard Guy Briggs <[email protected]> +*/ +#ifndef _LINUX_AUDITSCM_H_ +#define _LINUX_AUDITSCM_H_ + +enum auditsc_class_t { +AUDITSC_NATIVE =0 , +AUDITSC_COMPAT , +AUDITSC_OPEN , +AUDITSC_OPENAT , +AUDITSC_SOCKETCALL , +AUDITSC_EXECVE , + +AUDITSC_NVALS /* count */ +}; + +#endif
Signature · 2 lines
paul moore www.paul-moore.com
Re: [PATCH v3 1/3] audit: replace magic audit syscall class numbers with macros
Quoted 8 lines · Paul Moore
Quoted 6 lines · Richard Guy Briggs
Replace audit syscall class magic numbers with macros.
This required putting the macros into new header file
include/linux/auditscm.hsince the syscall macros were included for both 64 bit and 32 bit in any compat code, causing redefinition warnings.
Quoted 7 lines
The ifndef/define didn't protect against redeclaration? Huh. Maybe I'm not thinking about this correctly, or the arch specific code is doing something wonky ...
Regardless, assuming that it is necessary, I would prefer if we called it
auditsc.hinstead ofauditscm.h; the latter makes me think of sockets and not syscalls.
The "m" was for "macros", since there are auditsc bits in audit.h as well, but I have no significant objection.
Quoted 46 lines
Quoted 22 lines
Signed-off-by Richard Guy Briggs <[email protected]>--- MAINTAINERS | 1 + arch/alpha/kernel/audit.c | 8 ++++---- arch/ia64/kernel/audit.c | 8 ++++---- arch/parisc/kernel/audit.c | 8 ++++---- arch/parisc/kernel/compat_audit.c | 9 +++++---- arch/powerpc/kernel/audit.c | 10 +++++----- arch/powerpc/kernel/compat_audit.c | 11 ++++++----- arch/s390/kernel/audit.c | 10 +++++----- arch/s390/kernel/compat_audit.c | 11 ++++++----- arch/sparc/kernel/audit.c | 10 +++++----- arch/sparc/kernel/compat_audit.c | 11 ++++++----- arch/x86/ia32/audit.c | 11 ++++++----- arch/x86/kernel/audit_64.c | 8 ++++---- include/linux/audit.h | 1 + include/linux/auditscm.h | 23 +++++++++++++++++++++++ kernel/auditsc.c | 12 ++++++------ lib/audit.c | 10 +++++----- lib/compat_audit.c | 11 ++++++----- 18 files changed, 102 insertions(+), 71 deletions(-) create mode 100644 include/linux/auditscm.h...
Quoted 21 lines
include/linux/auditscm.h new file +15
-0@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* auditscm.h -- Auditing support syscall macros +* +* Copyright 2021 Red Hat Inc., Durham, North Carolina. +* All Rights Reserved. +* +* Author: Richard Guy Briggs <[email protected]> +*/ +#ifndef _LINUX_AUDITSCM_H_ +#define _LINUX_AUDITSCM_H_ + +enum auditsc_class_t { +AUDITSC_NATIVE =0 , +AUDITSC_COMPAT , + AUDITSC_OPEN,
Quoted 13 lines
Quoted 8 lines
include/linux/auditscm.h new file +8
-0+AUDITSC_OPENAT , +AUDITSC_SOCKETCALL , +AUDITSC_EXECVE , + +AUDITSC_NVALS /* count */ +}; + +#endif Signature · 2 lines
paul moore www.paul-moore.com
- RGB
--
Richard Guy Briggs <[email protected]>
Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635
Paul Moore
maintainerRe: [PATCH v3 1/3] audit: replace magic audit syscall class numbers with macros
Quoted 14 lines · Richard Guy Briggs
Quoted 12 lines · Paul Moore
Quoted 6 lines · Richard Guy Briggs
Replace audit syscall class magic numbers with macros.
This required putting the macros into new header file
include/linux/auditscm.hsince the syscall macros were included for both 64 bit and 32 bit in any compat code, causing redefinition warnings.The ifndef/define didn't protect against redeclaration? Huh. Maybe I'm not thinking about this correctly, or the arch specific code is doing something wonky ...
Quoted 6 lines
Quoted 3 lines
Regardless, assuming that it is necessary, I would prefer if we called it
auditsc.hinstead ofauditscm.h; the latter makes me think of sockets and not syscalls.The "m" was for "macros", since there are auditsc bits in
audit.has well, but I have no significant objection.
Yes, I figured as much, but my comment about it looking like a socket "thing" still stands. I'm open to other ideas if you don't like auditsc.h, I just don't like auditscm.h.
Signature · 2 lines
paul moore www.paul-moore.com
Re: [PATCH v3 1/3] audit: replace magic audit syscall class numbers with macros
In reply to Paul MooreQuoted 11 lines · Paul Moore
Quoted 6 lines · Richard Guy Briggs
Replace audit syscall class magic numbers with macros.
This required putting the macros into new header file
include/linux/auditscm.hsince the syscall macros were included for both 64 bit and 32 bit in any compat code, causing redefinition warnings.The ifndef/define didn't protect against redeclaration? Huh. Maybe I'm not thinking about this correctly, or the arch specific code is doing something wonky ...
I had a chat with Arnd about it in IRC upstream and started digging deeper and it got quite messy. As seen from the cover letter, audit.h pulled in a chain of things which weren't entirely unreasonable given it was compiling compat support in with native support by default. I suppose I could have defined _ASM_X86_UNISTD_64_H to prevent it from being added, but that would be ugly on a generated file, have caused a failure elsewhere and would need to be done for each compat file. I thought of defining CONFIG_X86_32 in arch/x86/ia32/audit.c but that would cause other problems. This was the cleanest solution. Otherwise I leave them as magic numbers like in V1.
Quoted 50 lines
Regardless, assuming that it is necessary, I would prefer if we called it
auditsc.hinstead ofauditscm.h; the latter makes me think of sockets and not syscalls.Quoted 22 lines
Signed-off-by Richard Guy Briggs <[email protected]>--- MAINTAINERS | 1 + arch/alpha/kernel/audit.c | 8 ++++---- arch/ia64/kernel/audit.c | 8 ++++---- arch/parisc/kernel/audit.c | 8 ++++---- arch/parisc/kernel/compat_audit.c | 9 +++++---- arch/powerpc/kernel/audit.c | 10 +++++----- arch/powerpc/kernel/compat_audit.c | 11 ++++++----- arch/s390/kernel/audit.c | 10 +++++----- arch/s390/kernel/compat_audit.c | 11 ++++++----- arch/sparc/kernel/audit.c | 10 +++++----- arch/sparc/kernel/compat_audit.c | 11 ++++++----- arch/x86/ia32/audit.c | 11 ++++++----- arch/x86/kernel/audit_64.c | 8 ++++---- include/linux/audit.h | 1 + include/linux/auditscm.h | 23 +++++++++++++++++++++++ kernel/auditsc.c | 12 ++++++------ lib/audit.c | 10 +++++----- lib/compat_audit.c | 11 ++++++----- 18 files changed, 102 insertions(+), 71 deletions(-) create mode 100644 include/linux/auditscm.h...
Quoted 21 lines
include/linux/auditscm.h new file +15
-0@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* auditscm.h -- Auditing support syscall macros +* +* Copyright 2021 Red Hat Inc., Durham, North Carolina. +* All Rights Reserved. +* +* Author: Richard Guy Briggs <[email protected]> +*/ +#ifndef _LINUX_AUDITSCM_H_ +#define _LINUX_AUDITSCM_H_ + +enum auditsc_class_t { +AUDITSC_NATIVE =0 , +AUDITSC_COMPAT , + AUDITSC_OPEN,
Quoted 13 lines
Quoted 8 lines
include/linux/auditscm.h new file +8
-0+AUDITSC_OPENAT , +AUDITSC_SOCKETCALL , +AUDITSC_EXECVE , + +AUDITSC_NVALS /* count */ +}; + +#endif Signature · 2 lines
paul moore www.paul-moore.com
- RGB
--
Richard Guy Briggs <[email protected]>
Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada
IRC: rgb, SunRaycer
Voice: +1.647.777.2635, Internal: (81) 32635
PATCH v3 2/3 audit: add support for the openat2 syscall
In reply to Richard Guy BriggsThe 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.
See the github issue
https://github.com/linux-audit/audit-kernel/issues/67
--- arch/alpha/kernel/audit.c | 2 ++ arch/ia64/kernel/audit.c | 2 ++ arch/parisc/kernel/audit.c | 2 ++ arch/parisc/kernel/compat_audit.c | 2 ++ arch/powerpc/kernel/audit.c | 2 ++ arch/powerpc/kernel/compat_audit.c | 2 ++ arch/s390/kernel/audit.c | 2 ++ arch/s390/kernel/compat_audit.c | 2 ++ arch/sparc/kernel/audit.c | 2 ++ arch/sparc/kernel/compat_audit.c | 2 ++ arch/x86/ia32/audit.c | 2 ++ arch/x86/kernel/audit_64.c | 2 ++ include/linux/auditscm.h | 1 + kernel/auditsc.c | 3 +++ lib/audit.c | 4 ++++ lib/compat_audit.c | 4 ++++ 16 files changed, 36 insertions(+)
arch/alpha/kernel/audit.c +2 -0
@@ -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 ; }
arch/ia64/kernel/audit.c +2 -0
@@ -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 ; }
arch/parisc/kernel/audit.c +2 -0
@@ -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 ; }
arch/parisc/kernel/compat_audit.c +2 -0
@@ -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 ; }
arch/powerpc/kernel/audit.c +2 -0
@@ -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 ; }
arch/powerpc/kernel/compat_audit.c +2 -0
@@ -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 ; }
arch/s390/kernel/audit.c +2 -0
@@ -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 ; }
arch/s390/kernel/compat_audit.c +2 -0
@@ -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 ; }
arch/sparc/kernel/audit.c +2 -0
@@ -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 ; }
arch/sparc/kernel/compat_audit.c +2 -0
@@ -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 ; }
arch/x86/ia32/audit.c +2 -0
@@ -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 ; }
arch/x86/kernel/audit_64.c +2 -0
@@ -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 ; }
include/linux/auditscm.h +1 -0
@@ -16,6 +16,7 @@ enum auditsc_class_t {AUDITSC_OPENAT ,AUDITSC_SOCKETCALL ,AUDITSC_EXECVE , +AUDITSC_OPENAT2 , AUDITSC_NVALS /* count */ };
kernel/auditsc.c +3 -0
@@ -76,6 +76,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"
@@ -195,6 +196,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 ; }
lib/audit.c +4 -0
@@ -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 ; }
lib/compat_audit.c +4 -0
@@ -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 ; }
Signature · 1 line
2.27.0
PATCH v3 3/3 audit: add OPENAT2 record to list how
In reply to Richard Guy BriggsSince the openat2(2) syscall uses a struct open_how pointer to communicate its parameters they are not usefully recorded by the audit SYSCALL record's four existing arguments.
Add a new audit record type OPENAT2 that reports the parameters in its third argument, struct open_how with fields oflag, mode and resolve.
The new record in the context of an event would look like:time->Wed Mar 17 16:28:53 2021
type=PROCTITLE msg=audit(1616012933.531:184): proctitle=73797363616C6C735F66696C652F6F70656E617432002F746D702F61756469742D7465737473756974652D737641440066696C652D6F70656E617432
type=PATH msg=audit(1616012933.531:184): item=1 name="file-openat2" inode=29 dev=00:1f mode=0100600 ouid=0 ogid=0 rdev=00:00 obj=unconfined_u:object_r:user_tmp_t:s0 nametype=CREATE cap_fp=0 cap_fi=0 cap_fe=0 cap_fver=0 cap_frootid=0
type=PATH msg=audit(1616012933.531:184): item=0 name="/root/rgb/git/audit-testsuite/tests" inode=25 dev=00:1f mode=040700 ouid=0 ogid=0 rdev=00:00 obj=unconfined_u:object_r:user_tmp_t:s0 nametype=PARENT cap_fp=0 cap_fi=0 cap_fe=0 cap_fver=0 cap_frootid=0
type=CWD msg=audit(1616012933.531:184): cwd="/root/rgb/git/audit-testsuite/tests"
type=OPENAT2 msg=audit(1616012933.531:184): oflag=0100302 mode=0600 resolve=0xa
type=SYSCALL msg=audit(1616012933.531:184): arch=c000003e syscall=437 success=yes exit=4 a0=3 a1=7ffe315f1c53 a2=7ffe315f1550 a3=18 items=2 ppid=528 pid=540 auid=0 uid=0 gid=0 euid=0 suid=0 fsuid=0 egid=0 sgid=0 fsgid=0 tty=ttyS0 ses=1 comm="openat2" exe="/root/rgb/git/audit-testsuite/tests/syscalls_file/openat2" subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 key="testsuite-1616012933-bjAUcEPO"
--- fs/open.c | 2 ++ include/linux/audit.h | 10 ++++++++++ include/uapi/linux/audit.h | 1 + kernel/audit.h | 2 ++ kernel/auditsc.c | 18 +++++++++++++++++- 5 files changed, 32 insertions(+), 1 deletion(-)
fs/open.c +2 -0
@@ -1235,6 +1235,8 @@ SYSCALL_DEFINE4(openat2, int, dfd, const char __user *, filename,if (err)return err; +audit_openat2_how (&tmp); +/* O_LARGEFILE is only allowed for non-O_PATH. */ if (!(tmp.flags &O_PATH ) &&force_o_largefile ()) tmp.flags |=O_LARGEFILE ;
include/linux/audit.h +10 -0
@@ -399,6 +399,7 @@ extern int __audit_log_bprm_fcaps(struct linux_binprm *bprm, const struct cred *old);extern void __audit_log_capset (const struct cred *new,const struct cred *old);extern void __audit_mmap_fd (int fd,int flags); +extern void __audit_openat2_how (struct open_how *how);extern void __audit_log_kern_module (char *name);extern void __audit_fanotify (unsigned int response);extern void __audit_tk_injoffset (struct timespec64 offset);
@@ -495,6 +496,12 @@ static inline void audit_mmap_fd(int fd, int flags)__audit_mmap_fd (fd, flags); } +static inline void audit_openat2_how (struct open_how *how) +{ +if (unlikely (!audit_dummy_context ())) +__audit_openat2_how (how); +} +static inline void audit_log_kern_module (char *name) {if (!audit_dummy_context ())
@@ -646,6 +653,9 @@ static inline void audit_log_capset(const struct cred *new,static inline void audit_mmap_fd (int fd,int flags) { } +static inline void audit_openat2_how (struct open_how *how) +{ } +static inline void audit_log_kern_module (char *name) { }
include/uapi/linux/audit.h +1 -0
@@ -118,6 +118,7 @@#define AUDIT_TIME_ADJNTPVAL 1333/* NTP value adjustment */ #define AUDIT_BPF 1334/* BPF subsystem */ #define AUDIT_EVENT_LISTENER 1335/* Task joined multicast read socket */ +#define AUDIT_OPENAT2 1336/* Record showing openat2 how args */ #define AUDIT_AVC 1400/* SE Linux avc denial or grant */ #define AUDIT_SELINUX_ERR 1401/* Internal SE Linux Errors */
kernel/audit.h +2 -0
@@ -11,6 +11,7 @@#include <linux/skbuff.h> #include <uapi/linux/mqueue.h> #include <linux/tty.h> +#include <uapi/linux/openat2.h> // struct open_how /* AUDIT_NAMES is the number of slots we reserve in the audit_context * for saving names from getname(). If we get more names we will allocate
@@ -185,6 +186,7 @@ struct audit_context {int fd;int flags; } mmap; +struct open_how openat2;struct {int argc; } execve;
kernel/auditsc.c +17 -1
@@ -76,7 +76,7 @@#include <linux/fsnotify_backend.h> #include <uapi/linux/limits.h> #include <uapi/linux/netfilter/nf_tables.h> -#include <uapi/linux/openat2.h> +#include <uapi/linux/openat2.h> // struct open_how #include "audit.h"
@@ -1310,6 +1310,12 @@ static void show_special(struct audit_context *context, int *call_panic)audit_log_format (ab,"fd=%d flags=0x%x" , context->mmap.fd, context->mmap.flags);break ; +case AUDIT_OPENAT2 : +audit_log_format (ab,"oflag=0%llo mode=0%llo resolve=0x%llx" , + context->openat2.flags, + context->openat2.mode, + context->openat2.resolve); +break ;case AUDIT_EXECVE :audit_log_execve_info (context, &ab);break ;
@@ -2529,6 +2535,16 @@ void __audit_mmap_fd(int fd, int flags) context->type =AUDIT_MMAP ; } +void __audit_openat2_how (struct open_how *how) +{ +struct audit_context *context =audit_context (); + + context->openat2.flags = how->flags; + context->openat2.mode = how->mode; + context->openat2.resolve = how->resolve; + context->type =AUDIT_OPENAT2 ; +} +void __audit_log_kern_module (char *name) {struct audit_context *context =audit_context ();
Signature · 6 lines
2.27.0 -- Linux-audit mailing list [email protected] https://listman.redhat.com/mailman/listinfo/linux-audit