| Message ID | bda073f2a8b11000ef40cf8b965305409ee88f44.1619811762.git.rgb@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | audit: add support for openat2 | expand |
On Fri, Apr 30, 2021 at 4:36 PM Richard Guy Briggs <rgb@redhat.com> wrote: > > 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. 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. > Signed-off-by: Richard Guy Briggs <rgb@redhat.com> > --- > 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 ... > diff --git a/include/linux/auditscm.h b/include/linux/auditscm.h > new file mode 100644 > index 000000000000..1c4f0ead5931 > --- /dev/null > +++ b/include/linux/auditscm.h > @@ -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 <rgb@redhat.com> > + */ > +#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
On 2021-05-10 21:23, Paul Moore wrote: > On Fri, Apr 30, 2021 at 4:36 PM Richard Guy Briggs <rgb@redhat.com> wrote: > > > > 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. > > 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. The "m" was for "macros", since there are auditsc bits in audit.h as well, but I have no significant objection. > > Signed-off-by: Richard Guy Briggs <rgb@redhat.com> > > --- > > 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 > > ... > > > diff --git a/include/linux/auditscm.h b/include/linux/auditscm.h > > new file mode 100644 > > index 000000000000..1c4f0ead5931 > > --- /dev/null > > +++ b/include/linux/auditscm.h > > @@ -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 <rgb@redhat.com> > > + */ > > +#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 > > -- > paul moore > www.paul-moore.com > - RGB -- Richard Guy Briggs <rgb@redhat.com> 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
On Tue, May 11, 2021 at 1:14 PM Richard Guy Briggs <rgb@redhat.com> wrote: > > On 2021-05-10 21:23, Paul Moore wrote: > > On Fri, Apr 30, 2021 at 4:36 PM Richard Guy Briggs <rgb@redhat.com> wrote: > > > > > > 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. > > > > 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. > > The "m" was for "macros", since there are auditsc bits in audit.h as > 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.
On 2021-05-10 21:23, Paul Moore wrote: > On Fri, Apr 30, 2021 at 4:36 PM Richard Guy Briggs <rgb@redhat.com> wrote: > > > > 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. > > 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. > 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. > > > Signed-off-by: Richard Guy Briggs <rgb@redhat.com> > > --- > > 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 > > ... > > > diff --git a/include/linux/auditscm.h b/include/linux/auditscm.h > > new file mode 100644 > > index 000000000000..1c4f0ead5931 > > --- /dev/null > > +++ b/include/linux/auditscm.h > > @@ -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 <rgb@redhat.com> > > + */ > > +#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 > > -- > paul moore > www.paul-moore.com > - RGB -- Richard Guy Briggs <rgb@redhat.com> 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
diff --git a/MAINTAINERS b/MAINTAINERS index 1249655459d3..2db1dc94888f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/arch/alpha/kernel/audit.c b/arch/alpha/kernel/audit.c index 96a9d18ff4c4..81cbd804e375 100644 --- a/arch/alpha/kernel/audit.c +++ b/arch/alpha/kernel/audit.c @@ -37,13 +37,13 @@ int audit_classify_syscall(int abi, unsigned syscall) { switch(syscall) { case __NR_open: - return 2; + return AUDITSC_OPEN; case __NR_openat: - return 3; + return AUDITSC_OPENAT; case __NR_execve: - return 5; + return AUDITSC_EXECVE; default: - return 0; + return AUDITSC_NATIVE; } } diff --git a/arch/ia64/kernel/audit.c b/arch/ia64/kernel/audit.c index 5192ca899fe6..dba6a74c9ab3 100644 --- a/arch/ia64/kernel/audit.c +++ b/arch/ia64/kernel/audit.c @@ -38,13 +38,13 @@ int audit_classify_syscall(int abi, unsigned syscall) { switch(syscall) { case __NR_open: - return 2; + return AUDITSC_OPEN; case __NR_openat: - return 3; + return AUDITSC_OPENAT; case __NR_execve: - return 5; + return AUDITSC_EXECVE; default: - return 0; + return AUDITSC_NATIVE; } } diff --git a/arch/parisc/kernel/audit.c b/arch/parisc/kernel/audit.c index 9eb47b2225d2..14244e83db75 100644 --- a/arch/parisc/kernel/audit.c +++ b/arch/parisc/kernel/audit.c @@ -47,13 +47,13 @@ int audit_classify_syscall(int abi, unsigned syscall) #endif switch (syscall) { case __NR_open: - return 2; + return AUDITSC_OPEN; case __NR_openat: - return 3; + return AUDITSC_OPENAT; case __NR_execve: - return 5; + return AUDITSC_EXECVE; default: - return 0; + return AUDITSC_NATIVE; } } diff --git a/arch/parisc/kernel/compat_audit.c b/arch/parisc/kernel/compat_audit.c index 20c39c9d86a9..0c181bb39f34 100644 --- a/arch/parisc/kernel/compat_audit.c +++ b/arch/parisc/kernel/compat_audit.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#include <linux/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; } } diff --git a/arch/powerpc/kernel/audit.c b/arch/powerpc/kernel/audit.c index a2dddd7f3d09..6eb18ef77dff 100644 --- a/arch/powerpc/kernel/audit.c +++ b/arch/powerpc/kernel/audit.c @@ -47,15 +47,15 @@ int audit_classify_syscall(int abi, unsigned syscall) #endif switch(syscall) { case __NR_open: - return 2; + return AUDITSC_OPEN; case __NR_openat: - return 3; + return AUDITSC_OPENAT; case __NR_socketcall: - return 4; + return AUDITSC_SOCKETCALL; case __NR_execve: - return 5; + return AUDITSC_EXECVE; default: - return 0; + return AUDITSC_NATIVE; } } diff --git a/arch/powerpc/kernel/compat_audit.c b/arch/powerpc/kernel/compat_audit.c index 55c6ccda0a85..f250777f6365 100644 --- a/arch/powerpc/kernel/compat_audit.c +++ b/arch/powerpc/kernel/compat_audit.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #undef __powerpc64__ +#include <linux/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; } } diff --git a/arch/s390/kernel/audit.c b/arch/s390/kernel/audit.c index d395c6c9944c..7e331e1831d4 100644 --- a/arch/s390/kernel/audit.c +++ b/arch/s390/kernel/audit.c @@ -47,15 +47,15 @@ int audit_classify_syscall(int abi, unsigned syscall) #endif switch(syscall) { case __NR_open: - return 2; + return AUDITSC_OPEN; case __NR_openat: - return 3; + return AUDITSC_OPENAT; case __NR_socketcall: - return 4; + return AUDITSC_SOCKETCALL; case __NR_execve: - return 5; + return AUDITSC_EXECVE; default: - return 0; + return AUDITSC_NATIVE; } } diff --git a/arch/s390/kernel/compat_audit.c b/arch/s390/kernel/compat_audit.c index 444fb1f66944..b2a2ed5d605a 100644 --- a/arch/s390/kernel/compat_audit.c +++ b/arch/s390/kernel/compat_audit.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #undef __s390x__ +#include <linux/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; } } diff --git a/arch/sparc/kernel/audit.c b/arch/sparc/kernel/audit.c index a6e91bf34d48..50fab35bdaba 100644 --- a/arch/sparc/kernel/audit.c +++ b/arch/sparc/kernel/audit.c @@ -48,15 +48,15 @@ int audit_classify_syscall(int abi, unsigned int syscall) #endif switch(syscall) { case __NR_open: - return 2; + return AUDITSC_OPEN; case __NR_openat: - return 3; + return AUDITSC_OPENAT; case __NR_socketcall: - return 4; + return AUDITSC_SOCKETCALL; case __NR_execve: - return 5; + return AUDITSC_EXECVE; default: - return 0; + return AUDITSC_NATIVE; } } diff --git a/arch/sparc/kernel/compat_audit.c b/arch/sparc/kernel/compat_audit.c index 10eeb4f15b20..fdf0d70b569b 100644 --- a/arch/sparc/kernel/compat_audit.c +++ b/arch/sparc/kernel/compat_audit.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #define __32bit_syscall_numbers__ +#include <linux/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; } } diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c index 6efe6cb3768a..d3dc8b57df81 100644 --- a/arch/x86/ia32/audit.c +++ b/arch/x86/ia32/audit.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#include <linux/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; } } diff --git a/arch/x86/kernel/audit_64.c b/arch/x86/kernel/audit_64.c index 83d9cad4e68b..2a6cc9c9c881 100644 --- a/arch/x86/kernel/audit_64.c +++ b/arch/x86/kernel/audit_64.c @@ -47,14 +47,14 @@ int audit_classify_syscall(int abi, unsigned syscall) #endif switch(syscall) { case __NR_open: - return 2; + return AUDITSC_OPEN; case __NR_openat: - return 3; + return AUDITSC_OPENAT; case __NR_execve: case __NR_execveat: - return 5; + return AUDITSC_EXECVE; default: - return 0; + return AUDITSC_NATIVE; } } diff --git a/include/linux/audit.h b/include/linux/audit.h index 82b7c1116a85..1137df4d4171 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -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> diff --git a/include/linux/auditscm.h b/include/linux/auditscm.h new file mode 100644 index 000000000000..1c4f0ead5931 --- /dev/null +++ b/include/linux/auditscm.h @@ -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 <rgb@redhat.com> + */ +#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 diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 8bb9ac84d2fb..8807afa6e237 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -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; diff --git a/lib/audit.c b/lib/audit.c index 5004bff928a7..3ec1a94d8d64 100644 --- a/lib/audit.c +++ b/lib/audit.c @@ -45,23 +45,23 @@ int audit_classify_syscall(int abi, unsigned syscall) switch(syscall) { #ifdef __NR_open case __NR_open: - return 2; + return AUDITSC_OPEN; #endif #ifdef __NR_openat case __NR_openat: - return 3; + return AUDITSC_OPENAT; #endif #ifdef __NR_socketcall case __NR_socketcall: - return 4; + return AUDITSC_SOCKETCALL; #endif #ifdef __NR_execveat case __NR_execveat: #endif case __NR_execve: - return 5; + return AUDITSC_EXECVE; default: - return 0; + return AUDITSC_NATIVE; } } diff --git a/lib/compat_audit.c b/lib/compat_audit.c index 77eabad69b4a..63125ad2edc0 100644 --- a/lib/compat_audit.c +++ b/lib/compat_audit.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/init.h> #include <linux/types.h> +#include <linux/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_open case __NR_open: - return 2; + return AUDITSC_OPEN; #endif #ifdef __NR_openat case __NR_openat: - return 3; + return AUDITSC_OPENAT; #endif #ifdef __NR_socketcall case __NR_socketcall: - return 4; + return AUDITSC_SOCKETCALL; #endif case __NR_execve: - return 5; + return AUDITSC_EXECVE; default: - return 1; + return AUDITSC_COMPAT; } }
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. Signed-off-by: Richard Guy Briggs <rgb@redhat.com> --- 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