audit: add support for openat2
Subsystems (9)
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
Richard Guy Briggs (2):
audit: add support for the openat2 syscall
audit: add OPENAT2 record to list how
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 ++ fs/open.c | 2 ++ include/linux/audit.h | 10 ++++++++++ include/uapi/linux/audit.h | 1 + kernel/audit.h | 2 ++ kernel/auditsc.c | 19 +++++++++++++++++++ lib/audit.c | 4 ++++ lib/compat_audit.c | 4 ++++ 19 files changed, 66 insertions(+)
Signature · 6 lines
2.27.0 -- Linux-audit mailing list [email protected] https://listman.redhat.com/mailman/listinfo/linux-audit
PATCH 1/2 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.
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 ++ kernel/auditsc.c | 3 +++ lib/audit.c | 4 ++++ lib/compat_audit.c | 4 ++++ 15 files changed, 35 insertions(+)
arch/alpha/kernel/audit.c +2 -0
@@ -42,6 +42,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }
arch/ia64/kernel/audit.c +2 -0
@@ -43,6 +43,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }
arch/parisc/kernel/audit.c +2 -0
@@ -52,6 +52,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }
arch/parisc/kernel/compat_audit.c +2 -0
@@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }
arch/powerpc/kernel/audit.c +2 -0
@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }
arch/powerpc/kernel/compat_audit.c +2 -0
@@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }
arch/s390/kernel/audit.c +2 -0
@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }
arch/s390/kernel/compat_audit.c +2 -0
@@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }
arch/sparc/kernel/audit.c +2 -0
@@ -55,6 +55,8 @@ int audit_classify_syscall(int abi, unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }
arch/sparc/kernel/compat_audit.c +2 -0
@@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }
arch/x86/ia32/audit.c +2 -0
@@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall)case __NR_execve:case __NR_execveat:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }
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 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }
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 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* 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 5 ; +#ifdef __NR_openat2 +case __NR_openat2: +return 6 ; +#endif default :return 0 ; }
lib/compat_audit.c +4 -0
@@ -45,6 +45,10 @@ int audit_classify_compat_syscall(int abi, unsigned syscall)#endif case __NR_execve:return 5 ; +#ifdef __NR_openat2 +case __NR_openat2: +return 6 ; +#endif default :return 1 ; }
Signature · 1 line
2.27.0
Re: [PATCH 1/2] audit: add support for the openat2 syscall
[+Cc Aleksa, the author of openat2()]
and a comment below. :)
Quoted 196 lines · Richard Guy Briggs
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.
See the github issue
https://github.com/linux-audit/audit-kernel/issues/67Signed-off-by Richard Guy Briggs <[email protected]>--- 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 ++ kernel/auditsc.c | 3 +++ lib/audit.c | 4 ++++ lib/compat_audit.c | 4 ++++ 15 files changed, 35 insertions(+)arch/alpha/kernel/audit.c +2
-0@@ -42,6 +42,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/ia64/kernel/audit.c +2
-0@@ -43,6 +43,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/audit.c +2
-0@@ -52,6 +52,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/compat_audit.c +2
-0@@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/powerpc/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/powerpc/kernel/compat_audit.c +2
-0@@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/s390/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/s390/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/sparc/kernel/audit.c +2
-0@@ -55,6 +55,8 @@ int audit_classify_syscall(int abi, unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/sparc/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/x86/ia32/audit.c +2
-0@@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall)case __NR_execve:case __NR_execveat:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }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 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }kernel/auditsc.c +1
-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"
kernel/auditsc.c static int audit_match_perm(struct audit_context *ctx, int mask) · line 200
Quoted 5 lines
kernel/auditsc.c +2
-0@@ -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 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ +return mask &ACC_MODE ((u32)((struct open_how *)ctx->argv[2 ])->flags);
That looks a bit dodgy. Maybe sm like the below would be a bit better?
kernel/auditsc.c +7 -0
@@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = {static int audit_match_perm (struct audit_context *ctx,int mask) { +struct open_how *openat2;unsigned n;if (unlikely (!ctx))return 0 ;
@@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask)return ((mask &AUDIT_PERM_WRITE ) && ctx->argv[0 ] ==SYS_BIND );case 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ + openat2 = ctx->argv[2 ]; +if (upper_32_bits (openat2->flags)) +pr_warn ("Some sensible warning about unknown flags" ); + +return mask &ACC_MODE (lower_32_bits (openat2->flags));default :return 0 ; }
(Ideally we'd probably notice at build-time that we've got flags exceeding 32bits. Could probably easily been done by exposing an all flags macro somewhere and then we can place a BUILD_BUG_ON() or sm into such places.)
Christian
Re: [PATCH 1/2] audit: add support for the openat2 syscall
Quoted 235 lines · Christian Brauner
[+Cc Aleksa, the author of
openat2()]and a comment below. :)
Quoted 196 lines · Richard Guy Briggs
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.
See the github issue
https://github.com/linux-audit/audit-kernel/issues/67Signed-off-by Richard Guy Briggs <[email protected]>--- 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 ++ kernel/auditsc.c | 3 +++ lib/audit.c | 4 ++++ lib/compat_audit.c | 4 ++++ 15 files changed, 35 insertions(+)arch/alpha/kernel/audit.c +2
-0@@ -42,6 +42,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/ia64/kernel/audit.c +2
-0@@ -43,6 +43,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/audit.c +2
-0@@ -52,6 +52,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/compat_audit.c +2
-0@@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/powerpc/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/powerpc/kernel/compat_audit.c +2
-0@@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/s390/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/s390/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/sparc/kernel/audit.c +2
-0@@ -55,6 +55,8 @@ int audit_classify_syscall(int abi, unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/sparc/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/x86/ia32/audit.c +2
-0@@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall)case __NR_execve:case __NR_execveat:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }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 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }kernel/auditsc.c +1
-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" kernel/auditsc.c static int audit_match_perm(struct audit_context *ctx, int mask) · line 200
Quoted 5 lines
kernel/auditsc.c +2
-0@@ -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 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ +return mask &ACC_MODE ((u32)((struct open_how *)ctx->argv[2 ])->flags);That looks a bit dodgy. Maybe sm like the below would be a bit better?
kernel/auditsc.c +7
-0@@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = {static int audit_match_perm (struct audit_context *ctx,int mask) { +struct open_how *openat2;unsigned n;if (unlikely (!ctx))return 0 ;@@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask)return ((mask &AUDIT_PERM_WRITE ) && ctx->argv[0 ] ==SYS_BIND );case 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ + openat2 = ctx->argv[2 ]; +if (upper_32_bits (openat2->flags)) +pr_warn ("Some sensible warning about unknown flags" ); + +return mask &ACC_MODE (lower_32_bits (openat2->flags));default :return 0 ; }
Quoted 4 lines
(Ideally we'd probably notice at build-time that we've got flags exceeding 32bits. Could probably easily been done by exposing an all flags macro somewhere and then we can place a
BUILD_BUG_ON()or sm into such places.)
And one more comment, why return a hard-coded integer from all of these architectures instead of introducing an enum in a central place with proper names idk:
enum audit_match_perm_t {
.
.
.
AUDIT_MATCH_PERM_EXECVE = 5,
AUDIT_MATCH_PERM_OPENAT2 = 6,
.
.
.
}Then you can drop these hard-coded comments too and it's way less brittle overall.
Christian
Re: [PATCH 1/2] audit: add support for the openat2 syscall
Quoted 8 lines · Christian Brauner
Quoted 7 lines · Christian Brauner
Quoted 6 lines · Richard Guy Briggs
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. See the github issue
https://github.com/linux-audit/audit-kernel/issues/67Signed-off-by Richard Guy Briggs <[email protected]>
...
Quoted 3 lines
And one more comment, why return a hard-coded integer from all of these architectures instead of introducing an enum in a central place with proper names idk:
Oh, believe me, I tried hard to do that because I really don't like hard-coded magic values, but for expediency I continued the same approach until I could sort out the header file mess. There was an extra preparatory patch (attached) in this patchset with a different audit syscall perms patch (also attached). By including "#include <linux/audit.h>" in each of the compat source files there were warnings of redefinitions of every __NR_* syscall number. The easiest way to get rid of it would have been to pull the new AUDITSC_* definitions into a new <linux/auditsc.h> file and include that from <linux/audit.h> and each of the arch/*/*/*audit.c (and lib/*audit.c) files.
Quoted 11 lines
enum audit_match_perm_t {
.
.
.
AUDIT_MATCH_PERM_EXECVE = 5,
AUDIT_MATCH_PERM_OPENAT2 = 6,
.
.
.
}Quoted 2 lines
Then you can drop these hard-coded comments too and it's way less brittle overall.
Totally agree.
Quoted 1 line
Christian
- 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
From 599ae48091296a3ad3eb4259e7af39cdf0f743c7 Mon Sep 17 00:00:00 2001
Message-Id: <599ae48091296a3ad3eb4259e7af39cdf0f743c7.1616067847.git.rgb@redhat.com>
In-Reply-To: <[email protected]>
References: <[email protected]>
From: Richard Guy Briggs <[email protected]>
Date: Fri, 22 Jan 2021 16:27:42 -0500
Subject: [PATCH 1/3] audit: replace magic audit syscall class numbers with
macros
Replace the magic numbers used to indicate audit syscall classes with macros.
--- 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 | 7 +++++++ kernel/auditsc.c | 12 ++++++------ lib/audit.c | 10 +++++----- lib/compat_audit.c | 11 ++++++----- 16 files changed, 84 insertions(+), 71 deletions(-)
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/audit.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/audit.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/audit.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/audit.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/audit.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 +7 -0
@@ -120,6 +120,13 @@ enum audit_nfcfgop {extern int is_audit_feature_set (int which); +#define AUDITSC_NATIVE 0 +#define AUDITSC_COMPAT 1 +#define AUDITSC_OPEN 2 +#define AUDITSC_OPENAT 3 +#define AUDITSC_SOCKETCALL 4 +#define AUDITSC_EXECVE 5 +extern int __init audit_register_class (int class,unsigned *list);extern int audit_classify_syscall (int abi,unsigned syscall);extern int audit_classify_arch (int arch);
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/audit.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
From cfd217b99e6e2646e0740b2ddead4c56ba394509 Mon Sep 17 00:00:00 2001
Message-Id: <cfd217b99e6e2646e0740b2ddead4c56ba394509.1616067847.git.rgb@redhat.com>
In-Reply-To: <[email protected]>
References: <[email protected]>
From: Richard Guy Briggs <[email protected]>
Date: Fri, 22 Jan 2021 13:48:17 -0500
Subject: [PATCH 2/3] audit: add support for the openat2 syscall
--- 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/audit.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/audit.h +1 -0
@@ -126,6 +126,7 @@ extern int is_audit_feature_set(int which);#define AUDITSC_OPENAT 3#define AUDITSC_SOCKETCALL 4#define AUDITSC_EXECVE 5 +#define AUDITSC_OPENAT2 6extern int __init audit_register_class (int class,unsigned *list);extern int audit_classify_syscall (int abi,unsigned syscall);
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
Re: [PATCH 1/2] audit: add support for the openat2 syscall
In reply to Christian BraunerQuoted 1 line · Christian Brauner
[+Cc Aleksa, the author of
openat2()]
Ah! Thanks for pulling in Aleksa. I thought I caught everyone...
Quoted 1 line
and a comment below. :)
Same...
Quoted 196 lines · Richard Guy Briggs
Quoted 195 lines
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.
See the github issue
https://github.com/linux-audit/audit-kernel/issues/67Signed-off-by Richard Guy Briggs <[email protected]>--- 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 ++ kernel/auditsc.c | 3 +++ lib/audit.c | 4 ++++ lib/compat_audit.c | 4 ++++ 15 files changed, 35 insertions(+)arch/alpha/kernel/audit.c +2
-0@@ -42,6 +42,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/ia64/kernel/audit.c +2
-0@@ -43,6 +43,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/audit.c +2
-0@@ -52,6 +52,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/compat_audit.c +2
-0@@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/powerpc/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/powerpc/kernel/compat_audit.c +2
-0@@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/s390/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/s390/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/sparc/kernel/audit.c +2
-0@@ -55,6 +55,8 @@ int audit_classify_syscall(int abi, unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/sparc/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/x86/ia32/audit.c +2
-0@@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall)case __NR_execve:case __NR_execveat:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }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 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }kernel/auditsc.c +1
-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"
Quoted 8 lines
kernel/auditsc.c static int audit_match_perm(struct audit_context *ctx, int mask) · line 200
Quoted 6 lines
kernel/auditsc.c +2
-0@@ -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 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ +return mask &ACC_MODE ((u32)((struct open_how *)ctx->argv[2 ])->flags);That looks a bit dodgy. Maybe sm like the below would be a bit better?
Ah, ok, fair enough, since original flags use a u32 and this was picked as u64 for alignment. It was just occurring to me last night that I might have the dubious honour of being the first usage of 0%llo format specifier in the kernel... ;-)
Quoted 26 lines
kernel/auditsc.c +7
-0@@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = {static int audit_match_perm (struct audit_context *ctx,int mask) { +struct open_how *openat2;unsigned n;if (unlikely (!ctx))return 0 ;@@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask)return ((mask &AUDIT_PERM_WRITE ) && ctx->argv[0 ] ==SYS_BIND );case 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ + openat2 = ctx->argv[2 ]; +if (upper_32_bits (openat2->flags)) +pr_warn ("Some sensible warning about unknown flags" ); + +return mask &ACC_MODE (lower_32_bits (openat2->flags));default :return 0 ; }
Quoted 6 lines
(Ideally we'd probably notice at build-time that we've got flags exceeding 32bits. Could probably easily been done by exposing an all flags macro somewhere and then we can place a
BUILD_BUG_ON()or sm into such places.)Christian
- 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
Re: [PATCH 1/2] audit: add support for the openat2 syscall
Quoted 245 lines · Richard Guy Briggs
Quoted 1 line · Christian Brauner
[+Cc Aleksa, the author of
openat2()]Ah! Thanks for pulling in Aleksa. I thought I caught everyone...
Quoted 1 line
and a comment below. :)
Same...
Quoted 196 lines · Richard Guy Briggs
Quoted 195 lines
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.
See the github issue
https://github.com/linux-audit/audit-kernel/issues/67Signed-off-by Richard Guy Briggs <[email protected]>--- 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 ++ kernel/auditsc.c | 3 +++ lib/audit.c | 4 ++++ lib/compat_audit.c | 4 ++++ 15 files changed, 35 insertions(+)arch/alpha/kernel/audit.c +2
-0@@ -42,6 +42,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/ia64/kernel/audit.c +2
-0@@ -43,6 +43,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/audit.c +2
-0@@ -52,6 +52,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/compat_audit.c +2
-0@@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/powerpc/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/powerpc/kernel/compat_audit.c +2
-0@@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/s390/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/s390/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/sparc/kernel/audit.c +2
-0@@ -55,6 +55,8 @@ int audit_classify_syscall(int abi, unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/sparc/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/x86/ia32/audit.c +2
-0@@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall)case __NR_execve:case __NR_execveat:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }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 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }kernel/auditsc.c +1
-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" Quoted 8 lines
kernel/auditsc.c static int audit_match_perm(struct audit_context *ctx, int mask) · line 200
Quoted 6 lines
kernel/auditsc.c +2
-0@@ -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 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ +return mask &ACC_MODE ((u32)((struct open_how *)ctx->argv[2 ])->flags);That looks a bit dodgy. Maybe sm like the below would be a bit better?
Ah, ok, fair enough, since original flags use a u32 and this was picked as u64 for alignment. It was just occurring to me last night that I might have the dubious honour of being the first usage of 0%llo format specifier in the kernel... ;-)
Quoted 26 lines
kernel/auditsc.c +7
-0@@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = {static int audit_match_perm (struct audit_context *ctx,int mask) { +struct open_how *openat2;unsigned n;if (unlikely (!ctx))return 0 ;@@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask)return ((mask &AUDIT_PERM_WRITE ) && ctx->argv[0 ] ==SYS_BIND );case 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ + openat2 = ctx->argv[2 ]; +if (upper_32_bits (openat2->flags)) +pr_warn ("Some sensible warning about unknown flags" ); + +return mask &ACC_MODE (lower_32_bits (openat2->flags));default :return 0 ; }
Quoted 4 lines
Quoted 4 lines
(Ideally we'd probably notice at build-time that we've got flags exceeding 32bits. Could probably easily been done by exposing an all flags macro somewhere and then we can place a
BUILD_BUG_ON()or sm into such places.)
open_how arguments are translated to open_flags which is limited to 32 bits.
This code is shared with the other open functions that are limited to 32 bits in open_flags. openat2 was created to avoid the limitations of openat, so at some point it isn't unreasonable that flags exceed 32 bits, but open_flags would have to be modified at that point to accommodate.
This value is handed in from userspace, and could be handed in without being defined in the kernel, so those values need to be properly checked regardless of the flags defined in the kernel.
The openat2 syscall claims to check all flags but no check is done on the top 32 bits.
build_open_flags() assigns how->flags to an int, effectively dropping the top 32 bits, before being checked against ~VALID_OPEN_FLAGS. This happens after audit mode filtering, but has the same result.
Audit mode filtering using ACC_MODE() already masks out all but the lowest two bits with O_ACCMODE, so there is no danger of overflowing a u32.
tomoyo_check_open_permission() assigns ACC_MODE() to u8 without a check.
All FMODE_* flags are clamped at u32.
6 bits remain at top and 4 bits just above O_ACCMODE, so there is no immediate danger of overflow and if any additional mode bits are needed they are available.
000377777703 used
037777777777 available
10 bits remaining
So, I don't think a check at this point in the code is useful, but do agree that there should be some changes and checks added in sys_openat2 and build_open_flags().
Also noticed: It looks like fddb5d430ad9f left in VALID_UPGRADE_FLAGS for how->upgrade_mask that was removed. This may be used at a later date, but at this point is dead code.
Quoted 3 lines
Quoted 1 line
Christian
- RGB
- 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
Re: [PATCH 1/2] audit: add support for the openat2 syscall
Quoted 258 lines · Richard Guy Briggs
Quoted 245 lines · Richard Guy Briggs
Quoted 1 line · Christian Brauner
[+Cc Aleksa, the author of
openat2()]Ah! Thanks for pulling in Aleksa. I thought I caught everyone...
Quoted 1 line
and a comment below. :)
Same...
Quoted 196 lines · Richard Guy Briggs
Quoted 195 lines
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.
See the github issue
https://github.com/linux-audit/audit-kernel/issues/67Signed-off-by Richard Guy Briggs <[email protected]>--- 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 ++ kernel/auditsc.c | 3 +++ lib/audit.c | 4 ++++ lib/compat_audit.c | 4 ++++ 15 files changed, 35 insertions(+)arch/alpha/kernel/audit.c +2
-0@@ -42,6 +42,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/ia64/kernel/audit.c +2
-0@@ -43,6 +43,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/audit.c +2
-0@@ -52,6 +52,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/parisc/kernel/compat_audit.c +2
-0@@ -35,6 +35,8 @@ int parisc32_classify_syscall(unsigned syscall)return 3 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/powerpc/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/powerpc/kernel/compat_audit.c +2
-0@@ -38,6 +38,8 @@ int ppc32_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/s390/kernel/audit.c +2
-0@@ -54,6 +54,8 @@ int audit_classify_syscall(int abi, unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/s390/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int s390_classify_syscall(unsigned syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/sparc/kernel/audit.c +2
-0@@ -55,6 +55,8 @@ int audit_classify_syscall(int abi, unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }arch/sparc/kernel/compat_audit.c +2
-0@@ -39,6 +39,8 @@ int sparc32_classify_syscall(unsigned int syscall)return 4 ;case __NR_execve:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }arch/x86/ia32/audit.c +2
-0@@ -39,6 +39,8 @@ int ia32_classify_syscall(unsigned syscall)case __NR_execve:case __NR_execveat:return 5 ; +case __NR_openat2: +return 6 ;default :return 1 ; }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 5 ; +case __NR_openat2: +return 6 ;default :return 0 ; }kernel/auditsc.c +1
-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" Quoted 8 lines
kernel/auditsc.c static int audit_match_perm(struct audit_context *ctx, int mask) · line 200
Quoted 6 lines
kernel/auditsc.c +2
-0@@ -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 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ +return mask &ACC_MODE ((u32)((struct open_how *)ctx->argv[2 ])->flags);That looks a bit dodgy. Maybe sm like the below would be a bit better?
Ah, ok, fair enough, since original flags use a u32 and this was picked as u64 for alignment. It was just occurring to me last night that I might have the dubious honour of being the first usage of 0%llo format specifier in the kernel... ;-)
Quoted 26 lines
kernel/auditsc.c +7
-0@@ -159,6 +159,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = {static int audit_match_perm (struct audit_context *ctx,int mask) { +struct open_how *openat2;unsigned n;if (unlikely (!ctx))return 0 ;@@ -195,6 +196,12 @@ static int audit_match_perm(struct audit_context *ctx, int mask)return ((mask &AUDIT_PERM_WRITE ) && ctx->argv[0 ] ==SYS_BIND );case 5 :/* execve */ return mask &AUDIT_PERM_EXEC ; +case 6 :/* openat2 */ + openat2 = ctx->argv[2 ]; +if (upper_32_bits (openat2->flags)) +pr_warn ("Some sensible warning about unknown flags" ); + +return mask &ACC_MODE (lower_32_bits (openat2->flags));default :return 0 ; }Quoted 4 lines
Quoted 4 lines
(Ideally we'd probably notice at build-time that we've got flags exceeding 32bits. Could probably easily been done by exposing an all flags macro somewhere and then we can place a
BUILD_BUG_ON()or sm into such places.)
open_howarguments are translated toopen_flagswhich is limited to 32 bits.This code is shared with the other open functions that are limited to 32 bits in
open_flags. openat2 was created to avoid the limitations of openat, so at some point it isn't unreasonable that flags exceed 32 bits, butopen_flagswould have to be modified at that point to accommodate.
Quoted 6 lines
This value is handed in from userspace, and could be handed in without being defined in the kernel, so those values need to be properly checked regardless of the flags defined in the kernel.
The openat2 syscall claims to check all flags but no check is done on the top 32 bits.
Hm, I think this is an oversight because of the different semantics for openat() and openat2(). We should check that no upper 32 bits are set for openat2(). That's the intended semantics. For old openat() we can't error on unknown flags because it has traditionally ignored unknown flags.
Quoted 4 lines
build_open_flags()assignshow->flagsto an int, effectively dropping the top 32 bits, before being checked against ~VALID_OPEN_FLAGS. This happens after audit mode filtering, but has the same result.
Right. That's at bug we should return an error to userspace. We do for any unkown values that fall within the lower 32 bit range so it's silly to ignore unknown values in the upper 32 bit range.
Quoted 8 lines
Audit mode filtering using
ACC_MODE()already masks out all but the lowest two bits withO_ACCMODE, so there is no danger of overflowing a u32.
tomoyo_check_open_permission()assignsACC_MODE()to u8 without a check.All FMODE_* flags are clamped at u32.
Quoted 8 lines
6 bits remain at top and 4 bits just above
O_ACCMODE, so there is no immediate danger of overflow and if any additional mode bits are needed they are available.
000377777703 used
037777777777 available
10 bits remainingSo, I don't think a check at this point in the code is useful, but do agree
Maybe but note that a defensive posture here might be a good thing instead of tripping over the issue later.
Quoted 7 lines
that there should be some changes and checks added in
sys_openat2andbuild_open_flags().Also noticed: It looks like
fddb5d430ad9fleft inVALID_UPGRADE_FLAGSforhow->upgrade_maskthat was removed. This may be used at a later date, but at this point is dead code.
I'll take a look now.
Christian
PATCH 2/2 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
@@ -398,6 +398,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);
@@ -494,6 +495,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 ())
@@ -645,6 +652,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
Quoted 9 lines · Richard Guy Briggs
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-openat2Supporting test case can be found in
https://github.com/linux-audit/audit-testsuite/pull/103
Seems sensible, thank you.